diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
index 893d655b4..67dcc51fe 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
@@ -182,12 +182,11 @@ BOOT_TOOLS:ccmp1 = "u-boot"
 FIP_UBOOT_HEADER = "ccmp15-dvk"
 FIP_UBOOT_HEADER:ccmp13 = "ccmp13-dvk"
 
-do_deploy:append:ccimx8x() {
+adapt_uboot_filenames:append:ccimx8x() {
 	# Move all U-Boot artifacts to the imx-boot-tools folder
 	# U-Boot images are not bootable on the i.MX8X
 	install -d ${DEPLOYDIR}/${BOOT_TOOLS}
 	mv ${DEPLOYDIR}/u-boot* ${DEPLOYDIR}/${BOOT_TOOLS}/
-	mv ${DEPLOYDIR}/${UBOOT_SYMLINK}-* ${DEPLOYDIR}/${BOOT_TOOLS}/
 }
 
 do_deploy:append:ccimx8m() {