diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index e36e030..9c7a39a 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -13,14 +13,14 @@
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-flash-mgmt \
         obmc-host-ipmi \
-        obmc-host-ctl \
         obmc-host-state-mgmt \
         obmc-chassis-state-mgmt \
         obmc-bmc-state-mgmt \
         "
-PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host"
+PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps"
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
 FLASH_SIZE = "32768"
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-
+VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
+VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"