diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index d8b309a3f..8139ba4af 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -17,11 +17,13 @@ EXTRA_IMAGEDEPENDS = "imx-boot"
 IMAGE_BOOTLOADER = "imx-boot"
 # BOOTLOADER_SEEK is 33 for step A of the silicon and 32 for step B
 BOOTLOADER_SEEK = "32"
-SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/imx-boot-${MACHINE}.bin"
+BOOTABLE_FILENAME = "imx-boot-${MACHINE}.bin"
+SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
 
 # RAM variants
 # This determines the number of different DCD files, and thus the number of
 # different U-Boot binaries required.
+# Last one is the default (the one the symlinks point at)
 RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_32bit"
 
 # Linux kernel configuration
diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
index c10bbc506..133fbb59d 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
@@ -118,6 +118,9 @@ do_deploy () {
 		done
 		cd ${DEPLOYDIR}
 		ln -sf ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin
+		# Link to default bootable U-Boot filename. It gets overwritten
+		# on every loop so the only last RAM_CONFIG will survive.
+		ln -sf ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOTABLE_FILENAME}
 		cd -
 	done
 }