diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 763f4f5..d8478bb 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -8,3 +8,9 @@
 BBFILE_COLLECTIONS += "ibm-layer"
 BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
 LAYERSERIES_COMPAT_ibm-layer = "langdale mickledore"
+
+# Only bring in meta-openpower bbappend files if meta-openpower is
+# included in the layer
+BBFILES_DYNAMIC += "\
+    openpower-layer:${LAYERDIR}/dynamic-layers/meta-openpower/recipes-*/*/*.bbappend \
+"
diff --git a/meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/host/op-proc-control_git.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/host/op-proc-control_git.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend
diff --git a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend
diff --git a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
diff --git a/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend