diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
index f4bed37e0..eb2eb03d3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
@@ -100,14 +100,13 @@ echo "Determining image files to use..."
 if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	module_variant=$(getenv "module_variant")
 	# Determine U-Boot file to program basing on SOM's variant
-	if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then
+	if [ -n "$module_variant" ]; then
 		if [ "$module_variant" = "0x01" ] || \
 		   [ "$module_variant" = "0x02" ]; then
-			module_ram="2GB"
-		else
-			module_ram="1GB"
+			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx"
+		elif [ "$module_variant" = "0x03" ] || \
+			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx"
 		fi
-		INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##${module_ram}.imx"
 	fi
 
 	# U-Boot when the checked value is empty.
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
index d09fd528a..c7feaf45d 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
@@ -102,7 +102,7 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	if [ -n "$soc_family" ]; then
 		module_variant=$(getenv "module_variant")
 		# Determine U-Boot file to program basing on SOM's variant
-		if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then
+		if [ -n "$module_variant" ]; then
 			if [ "$module_variant" = "0x12" ]; then
 				INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx"
 			elif [ "$module_variant" = "0x01" ] || \
@@ -117,7 +117,11 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 			     [ "$module_variant" = "0x15" ] || \
 			     [ "$module_variant" = "0x16" ]; then
 				INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc.imx"
-			else
+			elif [ "$module_variant" = "0x03" ] || \
+			     [ "$module_variant" = "0x0c" ] || \
+			     [ "$module_variant" = "0x0e" ] || \
+			     [ "$module_variant" = "0x0f" ] || \
+			     [ "$module_variant" = "0x13" ]; then
 				INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx"
 			fi
 		fi
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
index c6bab372e..390e9c713 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
@@ -115,7 +115,7 @@ echo "Determining image files to use..."
 if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
 	module_variant=$(getenv "module_variant")
 	# Determine U-Boot file to program basing on SOM's variant
-	if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then
+	if [ -n "$module_variant" ]; then
 		if [ "$module_variant" = "0x08" ] || \
 		   [ "$module_variant" = "0x0a" ]; then
 			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx"
@@ -123,7 +123,10 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
 		     [ "$module_variant" = "0x05" ] || \
 		     [ "$module_variant" = "0x07" ]; then
 			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx"
-		else
+		elif [ "$module_variant" = "0x02" ] || \
+		     [ "$module_variant" = "0x03" ] || \
+		     [ "$module_variant" = "0x06" ] || \
+		     [ "$module_variant" = "0x09" ]; then
 			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##.imx"
 		fi
 	fi