diff --git a/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-distrovars.inc b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-distrovars.inc
new file mode 100644
index 0000000..479e099
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/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/meta-openbmc-machines/meta-openpower/conf/distro/openbmc-openpower.conf b/meta-openbmc-machines/meta-openpower/conf/distro/openbmc-openpower.conf
new file mode 100644
index 0000000..5ee9b7c
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/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/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index a67b7f5..b2927d3 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/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"