diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg
deleted file mode 100644
index 27c702af0..000000000
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_legacy.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LEGACY_IMAGE_FORMAT is not set
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg
index 362903338..826c740cb 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/fit_signature.cfg
@@ -1,3 +1,4 @@
+# CONFIG_LEGACY_IMAGE_FORMAT is not set
 CONFIG_FIT_SIGNATURE=y
 CONFIG_RSA=y
 CONFIG_ECDSA=y
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb
index 3c21e4595..5e921be4c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb
@@ -9,13 +9,8 @@ DEPENDS += "python3-setuptools-native"
 SRCBRANCH = "v2021.10/master"
 SRCREV = "${AUTOREV}"
 
-UBOOT_FIT_CFG_FRAGMENTS = " \
-    file://fit_legacy.cfg \
-    file://fit_signature.cfg \
-"
-
 SRC_URI += " \
-    ${@oe.utils.conditional('TRUSTFENCE_FIT_IMG', '1', '${UBOOT_FIT_CFG_FRAGMENTS}', '', d)} \
+    ${@oe.utils.conditional('TRUSTFENCE_FIT_IMG', '1', 'file://fit_signature.cfg', '', d)} \
 "
 
 install_helper_files() {