diff --git a/layers/meta-balena-allwinner/recipes-core/images/resin-image.inc b/layers/meta-balena-allwinner/recipes-core/images/resin-image.inc
index aa6fa1e..199ba28 100644
--- a/layers/meta-balena-allwinner/recipes-core/images/resin-image.inc
+++ b/layers/meta-balena-allwinner/recipes-core/images/resin-image.inc
@@ -8,7 +8,7 @@ IMAGE_FSTYPES_append_orangepi-plus2 = " resinos-img"
 RESIN_IMAGE_BOOTLOADER_orangepi-plus2 = "u-boot"
 RESIN_BOOT_PARTITION_FILES_orangepi-plus2 = " \
     ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
-    uImage-sun8i-h3-orangepi-plus.dtb:/dtb/sun8i-h3-orangepi-plus.dtb \
+    sun8i-h3-orangepi-plus.dtb:/dtb/sun8i-h3-orangepi-plus.dtb \
     u-boot-sunxi-with-spl.bin: \
 "
 IMAGE_CMD_resinos-img_append_orangepi-plus2 () {
@@ -26,7 +26,7 @@ IMAGE_FSTYPES_append_orange-pi-one = " resinos-img"
 RESIN_IMAGE_BOOTLOADER_orange-pi-one = "u-boot"
 RESIN_BOOT_PARTITION_FILES_orange-pi-one = " \
     ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
-    uImage-sun8i-h3-orangepi-one.dtb:/dtb/sun8i-h3-orangepi-one.dtb \
+    sun8i-h3-orangepi-one.dtb:/dtb/sun8i-h3-orangepi-one.dtb \
     u-boot-sunxi-with-spl.bin: \
 "
 IMAGE_CMD_resinos-img_append_orange-pi-one () {
@@ -45,7 +45,7 @@ IMAGE_FSTYPES_append_bananapi-m1-plus = " resinos-img"
 RESIN_IMAGE_BOOTLOADER_bananapi-m1-plus = "u-boot"
 RESIN_BOOT_PARTITION_FILES_bananapi-m1-plus = " \
     ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
-    uImage-sun7i-a20-bananapi-m1-plus.dtb:/dtb/sun7i-a20-bananapi-m1-plus.dtb \
+    sun7i-a20-bananapi-m1-plus.dtb:/dtb/sun7i-a20-bananapi-m1-plus.dtb\
     u-boot-sunxi-with-spl.bin: \
 "
 IMAGE_CMD_resinos-img_append_bananapi-m1-plus () {
@@ -63,26 +63,26 @@ IMAGE_FSTYPES_append_orange-pi-lite = " resinos-img"
 RESIN_IMAGE_BOOTLOADER_orange-pi-lite = "u-boot"
 RESIN_BOOT_PARTITION_FILES_orange-pi-lite = " \
     ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
-    uImage-sun8i-h3-orangepi-lite.dtb:/dtb/sun8i-h3-orangepi-lite.dtb \
-    uImage-sun8i-h3-fixup.scr:/dtb/overlay/sun8i-h3-fixup.scr \
-    uImage-sun8i-h3-analog-codec.dtbo:/dtb/overlay/sun8i-h3-analog-codec.dtbo \
-    uImage-sun8i-h3-cir.dtbo:/dtb/overlay/sun8i-h3-cir.dtbo \
-    uImage-sun8i-h3-i2c0.dtbo:/dtb/overlay/sun8i-h3-i2c0.dtbo \
-    uImage-sun8i-h3-i2c1.dtbo:/dtb/overlay/sun8i-h3-i2c1.dtbo \
-    uImage-sun8i-h3-i2c2.dtbo:/dtb/overlay/sun8i-h3-i2c2.dtbo \
-    uImage-sun8i-h3-pps-gpio.dtbo:/dtb/overlay/sun8i-h3-pps-gpio.dtbo \
-    uImage-sun8i-h3-pwm.dtbo:/dtb/overlay/sun8i-h3-pwm.dtbo \
-    uImage-sun8i-h3-spdif-out.dtbo:/dtb/overlay/sun8i-h3-spdif-out.dtbo \
-    uImage-sun8i-h3-spi-add-cs1.dtbo:/dtb/overlay/sun8i-h3-spi-add-cs1.dtbo \
-    uImage-sun8i-h3-spi-jedec-nor.dtbo:/dtb/overlay/sun8i-h3-spi-jedec-nor.dtbo \
-    uImage-sun8i-h3-spi-spidev.dtbo:/dtb/overlay/sun8i-h3-spi-spidev.dtbo \
-    uImage-sun8i-h3-uart1.dtbo:/dtb/overlay/sun8i-h3-uart1.dtbo \
-    uImage-sun8i-h3-uart2.dtbo:/dtb/overlay/sun8i-h3-uart2.dtbo \
-    uImage-sun8i-h3-uart3.dtbo:/dtb/overlay/sun8i-h3-uart3.dtbo \
-    uImage-sun8i-h3-usbhost0.dtbo:/dtb/overlay/sun8i-h3-usbhost0.dtbo \
-    uImage-sun8i-h3-usbhost2.dtbo:/dtb/overlay/sun8i-h3-usbhost1.dtbo \
-    uImage-sun8i-h3-usbhost3.dtbo:/dtb/overlay/sun8i-h3-usbhost2.dtbo \
-    uImage-sun8i-h3-w1-gpio.dtbo:/dtb/overlay/sun8i-h3-w1-gpio.dtbo \
+    sun8i-h3-orangepi-lite.dtb:/dtb/sun8i-h3-orangepi-lite.dtb \
+    sun8i-h3-fixup.scr:/dtb/overlay/sun8i-h3-fixup.scr \
+    sun8i-h3-analog-codec.dtbo:/dtb/overlay/sun8i-h3-analog-codec.dtbo \
+    sun8i-h3-cir.dtbo:/dtb/overlay/sun8i-h3-cir.dtbo \
+    sun8i-h3-i2c0.dtbo:/dtb/overlay/sun8i-h3-i2c0.dtbo \
+    sun8i-h3-i2c1.dtbo:/dtb/overlay/sun8i-h3-i2c1.dtbo \
+    sun8i-h3-i2c2.dtbo:/dtb/overlay/sun8i-h3-i2c2.dtbo \
+    sun8i-h3-pps-gpio.dtbo:/dtb/overlay/sun8i-h3-pps-gpio.dtbo \
+    sun8i-h3-pwm.dtbo:/dtb/overlay/sun8i-h3-pwm.dtbo \
+    sun8i-h3-spdif-out.dtbo:/dtb/overlay/sun8i-h3-spdif-out.dtbo \
+    sun8i-h3-spi-add-cs1.dtbo:/dtb/overlay/sun8i-h3-spi-add-cs1.dtbo \
+    sun8i-h3-spi-jedec-nor.dtbo:/dtb/overlay/sun8i-h3-spi-jedec-nor.dtbo \
+    sun8i-h3-spi-spidev.dtbo:/dtb/overlay/sun8i-h3-spi-spidev.dtbo \
+    sun8i-h3-uart1.dtbo:/dtb/overlay/sun8i-h3-uart1.dtbo \
+    sun8i-h3-uart2.dtbo:/dtb/overlay/sun8i-h3-uart2.dtbo \
+    sun8i-h3-uart3.dtbo:/dtb/overlay/sun8i-h3-uart3.dtbo \
+    sun8i-h3-usbhost0.dtbo:/dtb/overlay/sun8i-h3-usbhost0.dtbo \
+    sun8i-h3-usbhost2.dtbo:/dtb/overlay/sun8i-h3-usbhost1.dtbo \
+    sun8i-h3-usbhost3.dtbo:/dtb/overlay/sun8i-h3-usbhost2.dtbo \
+    sun8i-h3-w1-gpio.dtbo:/dtb/overlay/sun8i-h3-w1-gpio.dtbo \
     boot.scr:/boot.scr \
     armbianEnv.txt:/ \
     "
@@ -103,13 +103,13 @@ IMAGE_FSTYPES_append_orange-pi-zero = " resinos-img"
 RESIN_IMAGE_BOOTLOADER_orange-pi-zero = "u-boot"
 RESIN_BOOT_PARTITION_FILES_orange-pi-zero = " \
     ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
-    uImage-sun8i-h2-plus-orangepi-zero.dtb:/dtb/sun8i-h2-plus-orangepi-zero.dtb \
+    sun8i-h2-plus-orangepi-zero.dtb:/dtb/sun8i-h2-plus-orangepi-zero.dtb \
     u-boot-sunxi-with-spl.bin: \
 "
 IMAGE_CMD_resinos-img_append_orange-pi-zero () {
     # Orange Pi Zero needs uboot written at a specific location
     dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
-}  
+}
 
 #
 # nanopi-neo-air
@@ -121,9 +121,9 @@ IMAGE_FSTYPES_append_nanopi-neo-air = " resinos-img"
 RESIN_IMAGE_BOOTLOADER_nanopi-neo-air = "u-boot"
 RESIN_BOOT_PARTITION_FILES_nanopi-neo-air = " \
     ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
-    uImage-sun8i-h3-nanopi-neo-air.dtb:/dtb/sun8i-h3-nanopi-neo-air.dtb \
-    boot.scr:/boot.scr \
+    sun8i-h3-nanopi-neo-air.dtb:/dtb/sun8i-h3-nanopi-neo-air.dtb \
     u-boot-sunxi-with-spl.bin: \
+    boot.scr:/boot.scr \
     "
 
 IMAGE_CMD_resinos-img_append_nanopi-neo-air () {