diff --git a/meta-oniro-staging/conf/layer.conf b/meta-oniro-staging/conf/layer.conf
index b9e137c5e64d18bd3f47e4aefc186ca96fd13891..139b954c929b2895b8756980d56e553135687ed6 100644
--- a/meta-oniro-staging/conf/layer.conf
+++ b/meta-oniro-staging/conf/layer.conf
@@ -19,6 +19,8 @@ BBFILES_DYNAMIC += "\
     intel:${LAYERDIR}/dynamic-layers/meta-intel/recipes-*/*/*.bbappend \
     meta-java:${LAYERDIR}/dynamic-layers/meta-java/recipes-*/*/*.bb \
     meta-java:${LAYERDIR}/dynamic-layers/meta-java/recipes-*/*/*.bbappend \
+    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/recipes-*/*/*.bb \
+    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/recipes-*/*/*.bbappend \
 "
 
 BBFILE_COLLECTIONS += "oniro-staging"
diff --git a/meta-oniro-staging/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch b/meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch
similarity index 100%
rename from meta-oniro-staging/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch
rename to meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch
diff --git a/meta-oniro-staging/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
similarity index 100%
rename from meta-oniro-staging/recipes-bsp/uefi/edk2-firmware_%.bbappend
rename to meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend