diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt
index cef4f9334..56f16d909 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt
@@ -31,11 +31,13 @@ else
 	if test -n "${module_variant}"; then
 		if test "${module_variant}" = "0x01"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_32bit.bin;
-		elif test "${module_variant}" = "0x02" || \
-		     test "${module_variant}" = "0x03"; then
+		elif test "${module_variant}" = "0x02"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin;
-		elif test "${module_variant}" = "0x04" || \
-		     test "${module_variant}" = "0x05"; then
+		elif test "${module_variant}" = "0x03"; then
+			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin;
+		elif test "${module_variant}" = "0x04"; then
+			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin;
+		elif test "${module_variant}" = "0x05"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin;
 		fi
 	fi
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt
index 4f9fe3265..9aa482a53 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt
@@ -42,11 +42,13 @@ else
 	if test -n "${module_variant}"; then
 		if test "${module_variant}" = "0x01"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin;
-		elif test "${module_variant}" = "0x02" || \
-		     test "${module_variant}" = "0x03"; then
+		elif test "${module_variant}" = "0x02"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin;
-		elif test "${module_variant}" = "0x04" || \
-		     test "${module_variant}" = "0x05"; then
+		elif test "${module_variant}" = "0x03"; then
+			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin;
+		elif test "${module_variant}" = "0x04"; then
+			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin;
+		elif test "${module_variant}" = "0x05"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin;
 		elif test "${module_variant}" = "0x06"; then
 			setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512GB_16bit.bin;
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt
index c1e68612c..dd3edbecb 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt
@@ -27,9 +27,11 @@ else
 	#
 	# Set overlays depending on the hardware variant
 	#
-	if test "${module_variant}" = "0x01" ||
-	   test "${module_variant}" = "0x02" ||
-	   test "${module_variant}" = "0x04"; then
+	if test "${module_variant}" = "0x01"; then
+		setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
+	elif test "${module_variant}" = "0x02"; then
+		setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
+	elif test "${module_variant}" = "0x04"; then
 		setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
 	fi
 fi