diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index be3b34b90..728e5f9e8 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -144,9 +144,11 @@ ST_USERFS   = "0"
 
 # Boot artifacts to be copied from the deploy dir to the installer ZIP
 BOOTABLE_ARTIFACTS = " \
-    tf-a-ccmp25-dvk-optee-emmc.stm32 \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'tf-a-ccmp25-dvk-optee-emmc${SIGN_SUFFIX}.stm32', \
+                                                           'tf-a-ccmp25-dvk-optee-emmc.stm32')} \
     metadata-ccmp25-dvk.bin \
-    fip-ccmp25-dvk-optee-emmc.bin \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'fip-ccmp25-dvk-optee-emmc${SIGN_SUFFIX}.bin', \
+                                                           'fip-ccmp25-dvk-optee-emmc.bin')} \
 "
 
 # Per-machine DISTRO_FEATURES customization