diff --git a/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index 0577085..f7ac0b5 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -8,14 +8,29 @@
 OBMC_RESET_BUTTON_INSTANCES ?= "0"
 OBMC_WATCHDOG_INSTANCES ?= "0"
 
-PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager"
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd"
-PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager"
 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-host-ipmi-hw ?= "phosphor-ipmi-hw-example"
-PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager"
+
+# obmc-bmc-state-manager
+#
+# Provides an implementation of the xyz.openbmc_project.State.BMC
+# interface.
+VIRTUAL-RUNTIME_obmc-bmc-state-manager ?= "phosphor-state-manager-bmc"
+
+# obmc-chassis-state-manager
+#
+# Provides an implementation of the xyz.openbmc_project.State.Chassis
+# interface.
+VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "phosphor-state-manager-chassis"
+
+# obmc-host-state-manager
+#
+# Provides an implementation of the xyz.openbmc_project.State.Host
+# interface.
+VIRTUAL-RUNTIME_obmc-host-state-manager ?= "phosphor-state-manager-host"
 
 # obmc-inventory-manager
 #
diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index 0cf12f6..11b8165 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -33,9 +33,6 @@
         obmc-host-ctl \
         avahi \
         slp \
-        obmc-host-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-bmc-state-mgmt \
         obmc-net-ipmi \
         ${DISTRO_FEATURES_LIBC} \
         "