diff --git a/meta-ohos-staging/conf/layer.conf b/meta-ohos-staging/conf/layer.conf
index eac4288989258de2ded98326d15e8fae03d2d51c..010a1d5440b0be380686a8e20e9940763851fe10 100644
--- a/meta-ohos-staging/conf/layer.conf
+++ b/meta-ohos-staging/conf/layer.conf
@@ -9,6 +9,12 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# We have .bbappend files to recipes in layers that we want to have as optional
+BBFILES_DYNAMIC += "\
+    stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bb \
+    stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bbappend \
+"
+
 BBFILE_COLLECTIONS += "meta-ohos-staging"
 BBFILE_PATTERN_meta-ohos-staging = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ohos-staging = "5"
diff --git a/meta-ohos-staging/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend b/meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend
similarity index 100%
rename from meta-ohos-staging/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend
rename to meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend
diff --git a/meta-ohos-staging/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend b/meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend
similarity index 100%
rename from meta-ohos-staging/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend
rename to meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend