diff --git a/conf/layer.conf b/conf/layer.conf
index 85b6c51c7e19af168c3564c3d955b931b70bb768..fe7ee9f3454d7e70f165fb7c033eeec4aca955ce 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -19,6 +19,8 @@ BBFILES_DYNAMIC += " \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
     intel:${LAYERDIR}/dynamic-layers/meta-intel/*/*/*.bb \
     intel:${LAYERDIR}/dynamic-layers/meta-intel/*/*/*.bbappend \
+    stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/*/*/*.bb \
+    stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/*/*/*.bbappend \
 "
 
 PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
diff --git a/recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch b/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch
similarity index 100%
rename from recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch
rename to dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch
diff --git a/recipes-security/optee/optee-os-stm32mp_%.bbappend b/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend
similarity index 100%
rename from recipes-security/optee/optee-os-stm32mp_%.bbappend
rename to dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend