diff --git a/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend b/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend
index 89811c4..04df973 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend
+++ b/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend
@@ -1 +1 @@
-PHOSPHOR_MAPPER_CONFIGS_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-dbus-interfaces-mapper-config-native')}"
+PHOSPHOR_MAPPER_CONFIGS_append_df-openpower = " openpower-dbus-interfaces-mapper-config-native"
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend b/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend
index bbd9de0..ad56a88 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend
@@ -1 +1 @@
-OBMC_IPMI_SENSORS_PROVIDERS_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-ipmi-oem-sensor-inventory-mrw-native')}"
+OBMC_IPMI_SENSORS_PROVIDERS_append_df-openpower = " openpower-ipmi-oem-sensor-inventory-mrw-native"
diff --git a/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend b/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend
index 11ac257..00d44c8 100644
--- a/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend
+++ b/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend
@@ -1 +1 @@
-DEPENDS_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-ipmi-oem-error-native')}"
+DEPENDS_append_df-openpower = " openpower-ipmi-oem-error-native"
diff --git a/common/recipes-phosphor/logging/phosphor-logging.bbappend b/common/recipes-phosphor/logging/phosphor-logging.bbappend
index 87f2e7d..e5de414 100644
--- a/common/recipes-phosphor/logging/phosphor-logging.bbappend
+++ b/common/recipes-phosphor/logging/phosphor-logging.bbappend
@@ -1,5 +1,5 @@
-DEPENDS_append = " ${@cf_enabled(d, 'obmc-openpower', '\
+DEPENDS_append_df-openpower = " \
         openpower-debug-collector-native \
         openpower-dbus-interfaces-native \
         openpower-occ-control-native \
-        ')}"
+        "
diff --git a/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
index 3bead56..adccb9b 100644
--- a/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
+++ b/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS_${PN}_append = " ${@cf_enabled(d, 'obmc-openpower', '\
+RDEPENDS_${PN}_append_df-openpower = " \
         nativesdk-openpower-dbus-interfaces-yaml \
         nativesdk-openpower-debug-collector-yaml \
-        ')}"
+        "
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index e0e13aa..7eb88fb 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,24 +1,24 @@
-RDEPENDS_${PN}-extrasdevtools_append = " ${@cf_enabled(d, 'obmc-openpower', 'obmc-pydevtools')}"
+RDEPENDS_${PN}-extrasdevtools_append_df-openpower = " obmc-pydevtools"
 
 # Add the deprecated /org/openbmc inventory namespace providing
 # obmc-mgr-inventory application to the inventory packagegroup
 # until all applications have been updated to use the new,
 # officially spec'ed xyz.openbmc_project.Inventory.Manager
 # provider (VIRTUAL-RUNTIME_obmc-inventory-manager).
-RDEPENDS_${PN}-inventory_append = " ${@cf_enabled(d, 'obmc-openpower-legacy', 'obmc-mgr-inventory')}"
+RDEPENDS_${PN}-inventory_append_df-openpower = " obmc-mgr-inventory"
 
 # Add the deprecated /org/openbmc sensor namespace providing
 # the obmc-mgr-sensor application to the sensor
 # packagegroup until all applications have been updated to use
 # the new, officially spec'ed xyz.openbmc_project.SensorValue
 # providers (VIRTUAL-RUNTIME_obmc-sensor-hwmon).
-RDEPENDS_${PN}-sensors_append = " ${@cf_enabled(d, 'obmc-openpower-legacy', 'obmc-mgr-sensor')}"
+RDEPENDS_${PN}-sensors_append_df-openpower = " obmc-mgr-sensor"
 
 # Add checkstop monitor as part of host state management package
 # This will kick start a gpio monitor that will catch the
 # host checkstop conditions and takes necessary actions
-RDEPENDS_${PN}-host-state-mgmt_append = " ${@cf_enabled(d, 'obmc-openpower', 'checkstop-monitor')}"
+RDEPENDS_${PN}-host-state-mgmt_append_df-openpower = " checkstop-monitor"
 
 # Add openpower debug collector as a requirement for state-mgmt
 # since it is used during checkstop handling.
-RDEPENDS_${PN}-host-state-mgmt_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-debug-collector')}"
+RDEPENDS_${PN}-host-state-mgmt_append_df-openpower = " openpower-debug-collector"
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
index e21ad4a..20e12e6 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend
@@ -1 +1 @@
-VIRTUAL-RUNTIME_phosphor-ipmi-providers_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-ipmi-oem')}"
+VIRTUAL-RUNTIME_phosphor-ipmi-providers_append_df-openpower = " openpower-ipmi-oem"
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
index a6089bb..5ba7c47 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
@@ -1,5 +1,5 @@
-RDEPENDS_${PN}_append = " ${@cf_enabled(d, 'obmc-openpower-extra', '\
+RDEPENDS_${PN}_append_df-openpower = " \
     pflash \
     gard \
     fsidbg \
-    ')}"
+    "
diff --git a/conf/distro/include/openpower-distrovars.inc b/conf/distro/include/openpower-distrovars.inc
new file mode 100644
index 0000000..479e099
--- /dev/null
+++ b/conf/distro/include/openpower-distrovars.inc
@@ -0,0 +1,4 @@
+DISTRO_FEATURES += "openpower"
+DISTRO_FEATURES_FILTER_NATIVE += "openpower"
+DISTRO_FEATURES_FILTER_NATIVESDK += "openpower"
+DISTROOVERRIDES .= ":df-openpower"
diff --git a/conf/distro/openbmc-openpower.conf b/conf/distro/openbmc-openpower.conf
new file mode 100644
index 0000000..5ee9b7c
--- /dev/null
+++ b/conf/distro/openbmc-openpower.conf
@@ -0,0 +1,2 @@
+require conf/distro/include/phosphor-base.inc
+require conf/distro/include/openpower-distrovars.inc
diff --git a/conf/machine/include/openpower.inc b/conf/machine/include/openpower.inc
index a67b7f5..b2927d3 100644
--- a/conf/machine/include/openpower.inc
+++ b/conf/machine/include/openpower.inc
@@ -7,9 +7,6 @@
         obmc-host-state-mgmt \
         obmc-chassis-state-mgmt \
         obmc-bmc-state-mgmt \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
         "
 
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
diff --git a/meta-ibm/meta-firestone/conf/local.conf.sample b/meta-ibm/meta-firestone/conf/local.conf.sample
index 02bdf50..1b0f3c1 100644
--- a/meta-ibm/meta-firestone/conf/local.conf.sample
+++ b/meta-ibm/meta-firestone/conf/local.conf.sample
@@ -85,7 +85,7 @@
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
diff --git a/meta-ibm/meta-firestone/conf/machine/firestone.conf b/meta-ibm/meta-firestone/conf/machine/firestone.conf
index 7035ec2..83f91e0 100644
--- a/meta-ibm/meta-firestone/conf/machine/firestone.conf
+++ b/meta-ibm/meta-firestone/conf/machine/firestone.conf
@@ -12,10 +12,4 @@
 
 FLASH_SIZE = "32768"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "firestone-ipmi-inventory-map-native"
diff --git a/meta-ibm/meta-garrison/conf/local.conf.sample b/meta-ibm/meta-garrison/conf/local.conf.sample
index 71919e3..48e27e9 100644
--- a/meta-ibm/meta-garrison/conf/local.conf.sample
+++ b/meta-ibm/meta-garrison/conf/local.conf.sample
@@ -85,7 +85,7 @@
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
diff --git a/meta-ibm/meta-garrison/conf/machine/garrison.conf b/meta-ibm/meta-garrison/conf/machine/garrison.conf
index c26eb8d..436c68a 100644
--- a/meta-ibm/meta-garrison/conf/machine/garrison.conf
+++ b/meta-ibm/meta-garrison/conf/machine/garrison.conf
@@ -11,10 +11,4 @@
 
 FLASH_SIZE = "32768"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "garrison-ipmi-inventory-map-native"
diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample
index e4b89fe..8627007 100644
--- a/meta-ibm/meta-palmetto/conf/local.conf.sample
+++ b/meta-ibm/meta-palmetto/conf/local.conf.sample
@@ -85,7 +85,7 @@
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index cae2774..5d71bf4 100644
--- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -15,12 +15,6 @@
 PHOSPHOR_MRW_URI = "git://github.com/open-power/palmetto-xml"
 PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 PREFERRED_PROVIDER_virtual/obmc-inventory-data = "obmc-inventory"
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "palmetto-ipmi-inventory-map-native"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "palmetto-led-manager-config-native"
diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample
index cfc3cef..b2b739f 100644
--- a/meta-ibm/meta-romulus/conf/local.conf.sample
+++ b/meta-ibm/meta-romulus/conf/local.conf.sample
@@ -63,7 +63,7 @@
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
index cbcda8c..b16943a 100644
--- a/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -13,11 +13,5 @@
 PHOSPHOR_MRW_URI = "git://github.com/open-power/romulus-xml"
 PHOSPHOR_MRW_REV = "14b471fbf37f5fb60261de001df83caf5f96d81f"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "romulus-ipmi-inventory-map-native"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native"
diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
index 543e7f9..f24a74b 100644
--- a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -2,3 +2,4 @@
 require conf/distro/include/phosphor-ubi.inc
 require conf/distro/include/openpower-mrw.inc
 require conf/distro/include/openpower-ubi.inc
+require conf/distro/include/openpower-distrovars.inc
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
index 75ef287..db6658f 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -15,12 +15,6 @@
 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 # Inhibit phosphor-hwmon-config-mrw
 VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
 
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample
index f0fa56b..f137436 100644
--- a/meta-ingrasys/meta-zaius/conf/local.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample
@@ -1,5 +1,5 @@
 MACHINE ??= "zaius"
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
index 2216dc1..9b1050a 100644
--- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
+++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
@@ -5,12 +5,6 @@
 
 FLASH_SIZE = "65536"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control'
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native"
 
diff --git a/meta-rackspace/meta-barreleye/conf/local.conf.sample b/meta-rackspace/meta-barreleye/conf/local.conf.sample
index f633c33..897f5fe 100644
--- a/meta-rackspace/meta-barreleye/conf/local.conf.sample
+++ b/meta-rackspace/meta-barreleye/conf/local.conf.sample
@@ -85,7 +85,7 @@
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
diff --git a/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
index 10866c8..2d16c2e 100644
--- a/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
+++ b/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
@@ -13,12 +13,6 @@
 
 OBMC_FAN_INSTANCES = "0 1 2 3 4 5"
 
-DISTRO_FEATURES_append = " \
-        obmc-openpower \
-        obmc-openpower-extra \
-        obmc-openpower-legacy \
-        "
-
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "barreleye-ipmi-inventory-map-native"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "barreleye-led-manager-config-native"