diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
index 31b686821..4e86519f6 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
@@ -8,7 +8,7 @@ install_abort=0
 BASEFILENAME=0
 
 setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-nand.stm32
-setenv INSTALL_FIP_FILENAME fip-##MACHINE##.bin
+setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
index 300373c39..393da9d47 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
@@ -8,7 +8,7 @@ install_abort=0
 BASEFILENAME=0
 
 setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-nand.stm32
-setenv INSTALL_FIP_FILENAME fip-##MACHINE##.bin
+setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh
index d4851367c..5c203eca0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh
@@ -121,7 +121,7 @@ fi
 
 # Determine FIP file to program
 if [ -z "${INSTALL_FIP_FILENAME}" ]; then
-	INSTALL_FIP_FILENAME="fip-##MACHINE##.bin"
+	INSTALL_FIP_FILENAME="fip-##MACHINE##-optee.bin"
 fi
 
 # Determine linux, recovery, and rootfs image filenames to update