diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 45fa6061e..0852c1e5f 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -96,7 +96,7 @@ ST_DEBUG_TRACE = "0"
 # trusted-firmware-a
 # =========================================================================
 # Configure trusted-firmware-a build
-TF_A_CONFIG ?= "optee nand"
+DEY_TF_A_CONFIG ?= "optee nand"
 
 # =========================================================================
 # optee
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 1bfc24619..438b46414 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -104,7 +104,7 @@ ST_DEBUG_TRACE = "0"
 # trusted-firmware-a
 # =========================================================================
 # Configure trusted-firmware-a build
-TF_A_CONFIG ?= "optee nand"
+DEY_TF_A_CONFIG ?= "optee nand"
 
 # =========================================================================
 # optee
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
index 9b0039a1a..c2c4762dd 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
@@ -14,6 +14,7 @@ SRC_URI = " \
     ${TFA_GIT_URI};branch=${SRCBRANCH} \
 "
 
+TF_A_CONFIG = "${DEY_TF_A_CONFIG}"
 TF_A_CONFIG[nand]   = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1"
 
 DEPENDS += " \