diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 405f76d5c..7b3504c62 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -62,6 +62,7 @@ OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
 OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
 # Supported boot schemes
 BOOTSCHEME_LABELS ?= "optee"
+BOOTSCHEME_DEFAULT ?= "optee"
 
 # =========================================================================
 # Machine features
@@ -156,8 +157,11 @@ ST_VENDORFS = "0"
 
 # Boot artifacts to be copied from the deploy dir to the installer ZIP
 BOOTABLE_ARTIFACTS = " \
-    arm-trusted-firmware/tf-a-ccmp13-dvk-256MB-nand.stm32 \
-    fip/fip-ccmp13-dvk-256MB-optee.bin \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'tf-a-ccmp13-dvk-256MB-${BOOTSCHEME_DEFAULT}-nand${SIGN_SUFFIX}.stm32', \
+                                                           'tf-a-ccmp13-dvk-256MB-${BOOTSCHEME_DEFAULT}-nand.stm32')} \
+    metadata-ccmp13-dvk.bin \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'fip-ccmp13-dvk-256MB-${BOOTSCHEME_DEFAULT}-nand${SIGN_SUFFIX}.bin', \
+                                                           'fip-ccmp13-dvk-256MB-${BOOTSCHEME_DEFAULT}-nand.bin')} \
 "
 
 # Default overlayfs_etc mount point and type
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index a5591dc79..6e20355d8 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -72,6 +72,7 @@ OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
 OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
 # Supported boot schemes
 BOOTSCHEME_LABELS ?= "opteemin"
+BOOTSCHEME_DEFAULT ?= "opteemin"
 
 # =========================================================================
 # Machine features
@@ -168,10 +169,15 @@ ST_USERFS   = "0"
 
 # Boot artifacts to be copied from the deploy dir to the installer ZIP
 BOOTABLE_ARTIFACTS = " \
-    arm-trusted-firmware/tf-a-ccmp15-dvk-512MB-nand.stm32 \
-    arm-trusted-firmware/tf-a-ccmp15-dvk-1GB-nand.stm32 \
-    fip/fip-ccmp15-dvk-512MB-optee.bin \
-    fip/fip-ccmp15-dvk-1GB-optee.bin \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'tf-a-ccmp15-dvk-512MB-${BOOTSCHEME_DEFAULT}-nand${SIGN_SUFFIX}.stm32', \
+                                                           'tf-a-ccmp15-dvk-512MB-${BOOTSCHEME_DEFAULT}-nand.stm32')} \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'tf-a-ccmp15-dvk-1GB-${BOOTSCHEME_DEFAULT}-nand${SIGN_SUFFIX}.stm32', \
+                                                           'tf-a-ccmp15-dvk-1GB-${BOOTSCHEME_DEFAULT}-nand.stm32')} \
+    metadata-ccmp15-dvk.bin \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'fip-ccmp15-dvk-512MB-${BOOTSCHEME_DEFAULT}-nand${SIGN_SUFFIX}.bin', \
+                                                           'fip-ccmp15-dvk-512MB-${BOOTSCHEME_DEFAULT}-nand.bin')} \
+    ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', 'fip-ccmp15-dvk-1GB-${BOOTSCHEME_DEFAULT}-nand${SIGN_SUFFIX}.bin', \
+                                                           'fip-ccmp15-dvk-1GB-${BOOTSCHEME_DEFAULT}-nand.bin')} \
 "
 
 # Default overlayfs_etc mount point and type