diff --git a/meta-ibm/conf/distro/include/ibm-yaml.inc b/meta-ibm/conf/distro/include/ibm-yaml.inc
index 4b18b9a..dde13f2 100644
--- a/meta-ibm/conf/distro/include/ibm-yaml.inc
+++ b/meta-ibm/conf/distro/include/ibm-yaml.inc
@@ -1 +1 @@
-OBMC_ORG_YAML_SUBDIRS += " com/ibm org/freedesktop"
+OBMC_ORG_YAML_SUBDIRS += " com/ibm"
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 642b19e..8d352b2 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -137,7 +137,7 @@
 KERNEL_CLASSES:append = " obmc-phosphor-kernel-version"
 
 # Some packages have directory trees of YAML files arranged based on
-# canonical organization names.  'xyz/openbmc_project' should be used
-# everywhere in phosphor, but some layers may append this with their
-# own organization(s).
-OBMC_ORG_YAML_SUBDIRS += " xyz/openbmc_project"
+# canonical organization names.  'org/freedesktop' and 'xyz/openbmc_project'
+# should be used everywhere in phosphor, but some layers may append this with
+# their own organization(s).
+OBMC_ORG_YAML_SUBDIRS += " org/freedesktop xyz/openbmc_project"