diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
index 980500b91..6f35ee776 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
@@ -49,46 +49,35 @@ else
 	fi
 fi
 
-
 # Back up environment variables
 setenv ORIG_overlays ${overlays}
 setenv ORIG_extra_bootargs ${extra_bootargs}
 
-# Set SOC type to "imx8mm" if not already defined by U-Boot
-if test ! -n "${soc_type}"; then
-	setenv soc_type "imx8mm"
-fi
-
 #
 # Determine overlays to apply depending on the hardware capabilities
 # described by the HWID, SOM version, and carrier board version.
 #
-if test -n "${module_ram}"; then
-	setexpr som_hv ${hwid_2} \& 38
-	setexpr som_hv ${som_hv} / 8
+setexpr module_has_wifi ${hwid_2} \& 20000
+setexpr module_has_wifi ${module_has_wifi} / 20000
+setexpr module_has_bt ${hwid_2} \& 40000
+setexpr module_has_bt ${module_has_bt} / 40000
 
-	setexpr module_has_wifi ${hwid_2} \& 10000
-	setexpr module_has_wifi ${module_has_wifi} / 10000
-	setexpr module_has_bt ${hwid_2} \& 20000
-	setexpr module_has_bt ${module_has_bt} / 20000
+if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
+	setenv overlays _ov_som_bt_ccimx93.dtbo,${overlays}
+fi
 
-	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-		setenv overlays _ov_som_bt_ccimx8m.dtbo,${overlays}
-	fi
-
-	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-		setenv overlays _ov_som_wifi_ccimx8m.dtbo,${overlays}
-	fi
+if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
+	setenv overlays _ov_som_wifi_ccimx93.dtbo,${overlays}
 fi
 
 setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
 dboot linux mmc ${mmcbootdev}:${mmcpart}
 
-
-
-# We only get here in case of an error on the dboot command.
-
+#
 # Undo changes to environment variables
+#
+# (we only get here in case of an error on the dboot command)
+#
 setenv overlays ${ORIG_overlays}
 setenv ORIG_overlays
 setenv extra_bootargs ${ORIG_extra_bootargs}