diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
index 413f0e3f5..78414f805 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
@@ -24,11 +24,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${hwid_2} \& 20000
 	setexpr module_has_bt ${module_has_bt} / 20000
 
-	if test "${module_has_bt}" = "1"; then
+	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
 		setenv overlays _ov_som_bt_ccimx8mn.dtbo,${overlays}
 	fi
 
-	if test "${module_has_wifi}" = "1"; then
+	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
 		setenv overlays _ov_som_wifi_ccimx8mn.dtbo,${overlays}
 	fi
 
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 875d874de..278914bcd 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
@@ -20,11 +20,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${hwid_3} \& 2
 	setexpr module_has_bt ${module_has_bt} / 2
 
-	if test "${module_has_bt}" = "1"; then
+	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
 		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
 	fi
 
-	if test "${module_has_wifi}" = "1"; then
+	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
 		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
 	fi
 else
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 eb6de7f06..481c8cc2d 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
@@ -20,11 +20,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${hwid_3} \& 2
 	setexpr module_has_bt ${module_has_bt} / 2
 
-	if test "${module_has_bt}" = "1"; then
+	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
 		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
 	fi
 
-	if test "${module_has_wifi}" = "1"; then
+	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
 		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
 	fi
 else