diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc
index 66b0f75..7d61f81 100644
--- a/meta-facebook/conf/machine/include/facebook-compute.inc
+++ b/meta-facebook/conf/machine/include/facebook-compute.inc
@@ -1,3 +1,3 @@
-require conf/machine/include/facebook.inc
+require conf/machine/include/facebook-withhost.inc
 
 OVERRIDES .= ":fb-compute"
diff --git a/meta-facebook/conf/machine/include/facebook-nohost.inc b/meta-facebook/conf/machine/include/facebook-nohost.inc
new file mode 100644
index 0000000..e9af8e9
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-nohost.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook.inc
+
+OVERRIDES .= ":fb-nohost"
diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc
new file mode 100644
index 0000000..ebe79d1
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-withhost.inc
@@ -0,0 +1,15 @@
+require conf/machine/include/facebook.inc
+
+OBMC_MACHINE_FEATURES += "\
+        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"
+
+OVERRIDES .= ":fb-withhost"
diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc
index 9c9490b..2993dc4 100644
--- a/meta-facebook/conf/machine/include/facebook.inc
+++ b/meta-facebook/conf/machine/include/facebook.inc
@@ -1,21 +1,14 @@
 OBMC_MACHINE_FEATURES += "\
         obmc-bmc-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-host-ipmi \
-        obmc-host-state-mgmt \
-        obmc-phosphor-chassis-mgmt \
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-flash-mgmt \
         "
 
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
 
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
 PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps"