diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
index 345996921..2eb09ad94 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
@@ -12,9 +12,9 @@ UBOOT_CONFIG[ccimx8x_sbc_express2GB] = "ccimx8x_sbc_express2GB_defconfig,,u-boot
 UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8qxp-sbc-express-id129.dtb \
-    digi/ccimx8qxp-sbc-express-wb.dtb \
     digi/ccimx8qxp-sbc-express.dtb \
+    digi/ccimx8x_ov_bt.dtbo \
+    digi/ccimx8x_ov_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"
diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
index 93d4fd1d6..09b3caf7b 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
@@ -13,11 +13,10 @@ UBOOT_CONFIG[ccimx8x_sbc_pro1GB] = "ccimx8x_sbc_pro1GB_defconfig,,u-boot-dtb.${U
 UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8dx-sbc-pro-wb.dtb \
     digi/ccimx8dx-sbc-pro.dtb \
-    digi/ccimx8qxp-sbc-pro-id135.dtb \
-    digi/ccimx8qxp-sbc-pro-wb.dtb \
     digi/ccimx8qxp-sbc-pro.dtb \
+    digi/ccimx8x_ov_bt.dtbo \
+    digi/ccimx8x_ov_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
index 43badca8d..a8e20191e 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
@@ -8,39 +8,39 @@ if test ! -n "${soc_type}"; then
 fi
 
 #
-# Set device tree filename depending on the board ID (if defined)
+# Set the base device tree filename
 #
-if test -n "${board_id}"; then
-	setenv fdt_file cc${soc_type}-sbc-express-id${board_id}.dtb
+setenv fdt_file cc${soc_type}-sbc-express.dtb
+
+#
+# Set predetermined overlays for specific board IDs
+#
+if test "${board_id}" = "129"; then
+	setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
 else
 	#
-	# Set device tree filename depending on the hardware capabilities
+	# Set overlays depending on the hardware capabilities
 	#
 	if test -n "${module_ram}"; then
 		setexpr module_has_wifi ${hwid_3} \& 1
 		setexpr module_has_bt ${hwid_3} \& 2
 		setexpr module_has_bt ${module_has_bt} / 2
 
-		if test "${module_has_wifi}" = "1" &&
-		   test "${module_has_bt}" = "1"; then
-			setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
-		else
-			setenv fdt_file cc${soc_type}-sbc-express.dtb
+		if test "${module_has_bt}" = "1"; then
+			setenv overlays ccimx8x_ov_bt.dtbo,${overlays}
+		fi
+
+		if test "${module_has_wifi}" = "1"; then
+			setenv overlays ccimx8x_ov_wifi.dtbo,${overlays}
 		fi
 	else
 		#
-		# Set device tree filename depending on the hardware variant
+		# Set overlays depending on the hardware variant
 		#
 		if test "${module_variant}" = "0x01" ||
 		   test "${module_variant}" = "0x02" ||
 		   test "${module_variant}" = "0x04"; then
-			setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
-		elif test "${module_variant}" = "0x03" ||
-		     test "${module_variant}" = "0x05" ||
-		     test "${module_variant}" = "0x06"; then
-			setenv fdt_file cc${soc_type}-sbc-express.dtb
-		else
-			setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
+			setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
 		fi
 	fi
 fi
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
index 3d0ce3556..76d9047b5 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
@@ -8,39 +8,39 @@ if test ! -n "${soc_type}"; then
 fi
 
 #
-# Set device tree filename depending on the board ID (if defined)
+# Set the base device tree filename
 #
-if test -n "${board_id}"; then
-	setenv fdt_file cc${soc_type}-sbc-pro-id${board_id}.dtb
+setenv fdt_file cc${soc_type}-sbc-pro.dtb
+
+#
+# Set predetermined overlays for specific board IDs
+#
+if test "${board_id}" = "135"; then
+	setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
 else
 	#
-	# Set device tree filename depending on the hardware capabilities
+	# Set overlays depending on the hardware capabilities
 	#
 	if test -n "${module_ram}"; then
 		setexpr module_has_wifi ${hwid_3} \& 1
 		setexpr module_has_bt ${hwid_3} \& 2
 		setexpr module_has_bt ${module_has_bt} / 2
 
-		if test "${module_has_wifi}" = "1" &&
-		   test "${module_has_bt}" = "1"; then
-			setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
-		else
-			setenv fdt_file cc${soc_type}-sbc-pro.dtb
+		if test "${module_has_bt}" = "1"; then
+			setenv overlays ccimx8x_ov_bt.dtbo,${overlays}
+		fi
+
+		if test "${module_has_wifi}" = "1"; then
+			setenv overlays ccimx8x_ov_wifi.dtbo,${overlays}
 		fi
 	else
 		#
-		# Set device tree filename depending on the hardware variant
+		# Set overlays depending on the hardware variant
 		#
 		if test "${module_variant}" = "0x01" ||
 		   test "${module_variant}" = "0x02" ||
 		   test "${module_variant}" = "0x04"; then
-			setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
-		elif test "${module_variant}" = "0x03" ||
-		     test "${module_variant}" = "0x05" ||
-		     test "${module_variant}" = "0x06"; then
-			setenv fdt_file cc${soc_type}-sbc-pro.dtb
-		else
-			setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
+			setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
 		fi
 	fi
 fi