diff --git a/meta-ibm/conf/distro/openbmc-witherspoon.conf b/meta-ibm/conf/distro/openbmc-witherspoon.conf
index 3d84a5c..1ccdeb3 100644
--- a/meta-ibm/conf/distro/openbmc-witherspoon.conf
+++ b/meta-ibm/conf/distro/openbmc-witherspoon.conf
@@ -3,4 +3,3 @@
 require conf/distro/include/phosphor-tiny.inc
 require conf/distro/include/openpower-mrw.inc
 require conf/distro/include/openpower-ubi.inc
-require conf/distro/include/ibm-distrovars.inc
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
new file mode 100644
index 0000000..0c632a1
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
@@ -0,0 +1,2 @@
+OBMC_ORG_YAML_SUBDIRS_append_witherspoon = " com/ibm"
+OBMC_ORG_YAML_SUBDIRS_append_rainier = " com/ibm"