diff --git a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
index 7b642c3..6a71182 100644
--- a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
+++ b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
@@ -1,3 +1,6 @@
 MACHINEOVERRIDES =. "fb-compute-singlehost:"
 
 require conf/machine/include/facebook-compute.inc
+
+MACHINE_FEATURES:append = " obmc-host-ipmi"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc
index 36ef7b7..282b7e6 100644
--- a/meta-facebook/conf/machine/include/facebook-withhost.inc
+++ b/meta-facebook/conf/machine/include/facebook-withhost.inc
@@ -2,14 +2,11 @@
 
 require conf/machine/include/facebook.inc
 
-MACHINE_FEATURES += "\
+MACHINE_FEATURES:append = "\
         obmc-chassis-state-mgmt \
-        obmc-host-ipmi \
         obmc-host-state-mgmt \
         obmc-phosphor-chassis-mgmt \
         "
 
 VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
 VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
-
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"