diff --git a/balena-yocto-scripts b/balena-yocto-scripts
index 4bfb805..bd419a9 160000
--- a/balena-yocto-scripts
+++ b/balena-yocto-scripts
@@ -1 +1 @@
-Subproject commit 4bfb805f24a1e260f708c63e5dfedea9dade3cd2
+Subproject commit bd419a972c100908641bbf18c49de37ba46edc35
diff --git a/bananapi-m1-plus.coffee b/bananapi-m1-plus.coffee
index 1a04ed4..e10ae79 100644
--- a/bananapi-m1-plus.coffee
+++ b/bananapi-m1-plus.coffee
@@ -23,7 +23,7 @@ module.exports =
 		machine: 'bananapi-m1-plus'
 		image: 'balena-image'
 		fstype: 'balenaos-img'
-		version: 'yocto-warrior'
+		version: 'yocto-dunfell'
 		deployArtifact: 'balena-image-bananapi-m1-plus.balenaos-img'
 		compressed: true
 
diff --git a/layers/meta-balena b/layers/meta-balena
index 700b93a..ed3dc32 160000
--- a/layers/meta-balena
+++ b/layers/meta-balena
@@ -1 +1 @@
-Subproject commit 700b93a1b7b777b31c919a28628f7be48abdfb0f
+Subproject commit ed3dc320a1b01b69aa8ebdf7cdf73d8374854c8a
diff --git a/layers/meta-balena-allwinner/conf/layer.conf b/layers/meta-balena-allwinner/conf/layer.conf
index 03ba780..c6726a0 100644
--- a/layers/meta-balena-allwinner/conf/layer.conf
+++ b/layers/meta-balena-allwinner/conf/layer.conf
@@ -7,5 +7,4 @@ BBFILE_COLLECTIONS += "balena-allwinner"
 BBFILE_PATTERN_balena-allwinner := "^${LAYERDIR}/"
 BBFILE_PRIORITY_balena-allwinner = "1337"
 
-LAYERSERIES_COMPAT_balena-allwinner = "warrior"
-LAYERSERIES_COMPAT_meta-sunxi = "warrior"
+LAYERSERIES_COMPAT_balena-allwinner = "dunfell"
diff --git a/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample b/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample
index ed25119..e06415f 100644
--- a/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample
+++ b/layers/meta-balena-allwinner/conf/samples/bblayers.conf.sample
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
     ${TOPDIR}/../layers/meta-openembedded/meta-python \
     ${TOPDIR}/../layers/meta-sunxi \
     ${TOPDIR}/../layers/meta-balena/meta-balena-common \
-    ${TOPDIR}/../layers/meta-balena/meta-balena-warrior \
+    ${TOPDIR}/../layers/meta-balena/meta-balena-dunfell \
     ${TOPDIR}/../layers/meta-balena-allwinner \
     ${TOPDIR}/../layers/meta-rust \
     "
diff --git a/layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend b/layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend
deleted file mode 100644
index 75ec9e2..0000000
--- a/layers/meta-balena-allwinner/recipes-kernel/xradio/xradio.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SRCREV = "8965ea55ddfd862ee76384913f82e6b69628cd27"
diff --git a/layers/meta-openembedded b/layers/meta-openembedded
index a24acf9..4a0d93d 160000
--- a/layers/meta-openembedded
+++ b/layers/meta-openembedded
@@ -1 +1 @@
-Subproject commit a24acf94d48d635eca668ea34598c6e5c857e3f8
+Subproject commit 4a0d93d250576177e1237fa559f55c4f9d371809
diff --git a/layers/meta-rust b/layers/meta-rust
index c5ff05d..aec6519 160000
--- a/layers/meta-rust
+++ b/layers/meta-rust
@@ -1 +1 @@
-Subproject commit c5ff05d1e99c1e80844c1673456e2368499918c7
+Subproject commit aec6519e23a9fe5b497d23053bdf408df5de4af6
diff --git a/layers/meta-sunxi b/layers/meta-sunxi
index ee3a551..f367a1f 160000
--- a/layers/meta-sunxi
+++ b/layers/meta-sunxi
@@ -1 +1 @@
-Subproject commit ee3a551b8316328f72a29f36376bc85f1a0a2fb2
+Subproject commit f367a1ff2c329c801659c6de77910456a4167430
diff --git a/layers/poky b/layers/poky
index f475afc..a13bda4 160000
--- a/layers/poky
+++ b/layers/poky
@@ -1 +1 @@
-Subproject commit f475afc5df0837532dcd0f3a831ddc3aec8941f1
+Subproject commit a13bda44fcda4e79e9aed39ca1495eabecb6a7b7
diff --git a/nanopi-neo-air.coffee b/nanopi-neo-air.coffee
index 19d1ad6..a95801c 100644
--- a/nanopi-neo-air.coffee
+++ b/nanopi-neo-air.coffee
@@ -38,7 +38,7 @@ module.exports =
 		machine: 'nanopi-neo-air'
 		image: 'balena-image-flasher'
 		fstype: 'balenaos-img'
-		version: 'yocto-warrior'
+		version: 'yocto-dunfell'
 		deployArtifact: 'balena-image-flasher-nanopi-neo-air.balenaos-img'
 		compressed: true
 
diff --git a/orange-pi-lite.coffee b/orange-pi-lite.coffee
index 3441cb2..a2fcd4c 100644
--- a/orange-pi-lite.coffee
+++ b/orange-pi-lite.coffee
@@ -23,7 +23,7 @@ module.exports =
 		machine: 'orange-pi-lite'
 		image: 'balena-image'
 		fstype: 'balenaos-img'
-		version: 'yocto-warrior'
+		version: 'yocto-dunfell'
 		deployArtifact: 'balena-image-orange-pi-lite.balenaos-img'
 		compressed: true
 
diff --git a/orange-pi-one.coffee b/orange-pi-one.coffee
index 978331c..609577d 100644
--- a/orange-pi-one.coffee
+++ b/orange-pi-one.coffee
@@ -24,7 +24,7 @@ module.exports =
 		machine: 'orange-pi-one'
 		image: 'balena-image'
 		fstype: 'balenaos-img'
-		version: 'yocto-warrior'
+		version: 'yocto-dunfell'
 		deployArtifact: 'balena-image-orange-pi-one.balenaos-img'
 		compressed: true
 
diff --git a/orange-pi-zero.coffee b/orange-pi-zero.coffee
index de28076..14757d6 100644
--- a/orange-pi-zero.coffee
+++ b/orange-pi-zero.coffee
@@ -24,7 +24,7 @@ module.exports =
 		machine: 'orange-pi-zero'
 		image: 'balena-image'
 		fstype: 'balenaos-img'
-		version: 'yocto-warrior'
+		version: 'yocto-dunfell'
 		deployArtifact: 'balena-image-orange-pi-zero.balenaos-img'
 		compressed: true
 
diff --git a/orangepi-plus2.coffee b/orangepi-plus2.coffee
index 0c8a499..d637896 100644
--- a/orangepi-plus2.coffee
+++ b/orangepi-plus2.coffee
@@ -38,7 +38,7 @@ module.exports =
 		machine: 'orangepi-plus2'
 		image: 'balena-image-flasher'
 		fstype: 'balenaos-img'
-		version: 'yocto-warrior'
+		version: 'yocto-dunfell'
 		deployArtifact: 'balena-image-flasher-orangepi-plus2.balenaos-img'
 		compressed: true