diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/ccimx93/mmc/fw_env.config b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/mmc/fw_env_boot1_boot2.config
similarity index 100%
rename from meta-digi-arm/recipes-bsp/libubootenv/libubootenv/ccimx93/mmc/fw_env.config
rename to meta-digi-arm/recipes-bsp/libubootenv/libubootenv/mmc/fw_env_boot1_boot2.config
diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
index 1a2f98766..8f69db3de 100644
--- a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
@@ -15,6 +15,9 @@ FW_CONFIG_FILE:ccmp1 = "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs
 				'ubi/fw_env.config_default', \
 				'ubi/fw_env.config', d)}"
 
+FW_CONFIG_FILE:ccimx9 = "${STORAGE_MEDIA}/fw_env_boot1_boot2.config"
+FW_CONFIG_FILE:ccmp2 = "${STORAGE_MEDIA}/fw_env_boot1_boot2.config"
+
 DEPENDS += "${@oe.utils.conditional('OPTEE_PATCHES', '', '', 'optee-client', d)}"
 
 OPTEE_PATCHES = ""