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 c7d6fc9..4e79587 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -11,9 +11,7 @@
 
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "btbridged"
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "skeleton"
-PREFERRED_PROVIDER_virtual/obmc-event-mgmt = "obmc-phosphor-event"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "skeleton"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "skeleton"
 PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "skeleton"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "skeleton"
-PREFERRED_PROVIDER_virtual/obmc-user-mgmt = "obmc-phosphor-user"
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 3cff3f6..601275e 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -9,3 +9,11 @@
 OBMC_FAN_INSTANCES ?= ""
 
 PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent"
+PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event"
+PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "host-ipmi-hw-example"
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd"
+PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc
index cdf10de..4a1b17f 100644
--- a/meta-phosphor/conf/machine/include/sample.inc
+++ b/meta-phosphor/conf/machine/include/sample.inc
@@ -5,12 +5,3 @@
         obmc-phosphor-flash-mgmt \
         obmc-host-ipmi \
         "
-
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "host-ipmi-hw-example"
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "obmc-phosphor-chassisd"
-PREFERRED_PROVIDER_virtual/obmc-event-mgmt = "obmc-phosphor-event"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "obmc-phosphor-fand"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "obmc-phosphor-flashd"
-PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "obmc-phosphor-sensord"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "obmc-phosphor-sysd"
-PREFERRED_PROVIDER_virtual/obmc-user-mgmt = "obmc-phosphor-user"