diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 18b567fca..f31c75360 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -75,8 +75,8 @@ FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb"
 OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
 OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
 # Supported boot schemes
-BOOTSCHEME_LABELS ?= "opteemin"
-BOOTSCHEME_DEFAULT ?= "opteemin"
+BOOTSCHEME_LABELS ?= "optee"
+BOOTSCHEME_DEFAULT ?= "optee"
 
 # =========================================================================
 # Machine features
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
index f73e29b3e..a061dda9d 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
@@ -107,7 +107,7 @@ do_compile() {
             soc_name=""
             if [ -n "${STM32MP_SOC_NAME}" ]; then
                 for soc in ${STM32MP_SOC_NAME}; do
-                    if [ "$(echo ${dt} | grep -c ${soc})" -eq 1 ]; then
+                    if [ "$(echo ${dt} | grep -c ${soc})" -eq 1 ] || [ "$(echo ${dt} | grep -c ${TF_A_SOC_MATCH})" -eq 1 ] ;then
                         soc_extra_opt="$(echo ${soc} | awk '{print toupper($0)}')=1"
                         soc_suffix="-${soc}"