diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 6520d6faa..0cfde3433 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -190,3 +190,14 @@ VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
 
 # Disable use of vendorfs partition
 ST_VENDORFS = "0"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.ubifs"
+ROOTFS_EXT ?= ".ubifs"
+
+BOOT_DEV_NAME ?= "linux"
+ROOTFS_DEV_NAME ?= "rootfs"
+ROOTFS_ENC_DEV = "${ROOTFS_DEV_NAME}"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+UBOOT_DEV_NAME ?= "/dev/mtd"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index 9c023fb5f..dca989cfb 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -46,3 +46,14 @@ TRUSTFENCE_SIGN_MODE = "HAB"
 # Adding 'wayland' along with 'x11' enables the xwayland backend
 # Adding pam is required for SELinux functionality
 DISTRO_FEATURES:append = " wayland pam"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.vfat"
+ROOTFS_EXT ?= ".ext4.gz"
+
+BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
+ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
+ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+UBOOT_DEV_NAME ?= "/dev/mmcblk0boot0"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index faddf9af2..37bd47106 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -50,3 +50,14 @@ MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191"
 
 # TrustFence
 TRUSTFENCE_SIGN_MODE = "HAB"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.ubifs"
+ROOTFS_EXT ?= ".ubifs"
+
+BOOT_DEV_NAME ?= "linux"
+ROOTFS_DEV_NAME ?= "rootfs"
+ROOTFS_ENC_DEV = "${ROOTFS_DEV_NAME}"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+UBOOT_DEV_NAME ?= "/dev/mtd"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc
index 37c194590..21fddb861 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8m.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc
@@ -61,3 +61,14 @@ TRUSTFENCE_SIGN_MODE = "HAB"
 # Vulkan is necessary for wayland to build
 DISTRO_FEATURES:append = " wayland vulkan systemd pam"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.vfat"
+ROOTFS_EXT ?= ".ext4.gz"
+
+BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
+ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
+ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+UBOOT_DEV_NAME ?= "/dev/mmcblk0boot0"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 81ae19151..a017cda14 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -78,3 +78,14 @@ TRUSTFENCE_SIGN_MODE = "AHAB"
 # Vulkan is necessary for wayland to build
 DISTRO_FEATURES:append = " wayland vulkan systemd pam"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.vfat"
+ROOTFS_EXT ?= ".ext4.gz"
+
+BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
+ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
+ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+UBOOT_DEV_NAME ?= "/dev/mmcblk0boot0"
diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc
index 54a29e30d..ffd4afe77 100644
--- a/meta-digi-dey/recipes-digi/swu-images/swu.inc
+++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc
@@ -25,25 +25,10 @@ SWUPDATE_IMAGES = " \
 SOFTWARE_VERSION ?= "0.0.1"
 DESCRIPTION = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', 'Encrypted rootfs ${IMG_NAME} update', '${IMG_NAME} update')}"
 
-BOOTFS_EXT ?= ".boot.vfat"
-BOOTFS_EXT:ccimx6ul ?= ".boot.ubifs"
-BOOTFS_EXT:ccmp1 ?= ".boot.ubifs"
-ROOTFS_EXT ?= ".ext4.gz"
-ROOTFS_EXT:ccimx6ul ?= ".ubifs"
-ROOTFS_EXT:ccmp1 ?= ".ubifs"
 UBOOT_EXT ?= ".${UBOOT_SUFFIX}"
 
 UBOOTIMG_OFFSET ?= "${BOOTLOADER_SEEK_BOOT}"
-BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
-BOOT_DEV_NAME:ccimx6ul ?= "linux"
-BOOT_DEV_NAME:ccmp1 ?= "linux"
-ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
-ROOTFS_DEV_NAME:ccimx6ul ?= "rootfs"
-ROOTFS_DEV_NAME:ccmp1 ?= "rootfs"
-ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
-ROOTFS_ENC_DEV:ccimx6ul = "${ROOTFS_DEV_NAME}"
-ROOTFS_ENC_DEV:ccmp1 = "${ROOTFS_DEV_NAME}"
-ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
 SWUPDATE_STORAGE_MEDIA = "${@oe.utils.conditional('STORAGE_MEDIA', 'mmc', 'swupdate_uboot_mmc.sh', 'swupdate_uboot_nand.sh', d)}"
 
 python () {