diff --git a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc
new file mode 100644
index 0000000..f472cfa
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook-compute.inc
+
+OVERRIDES .= ":fb-compute-multihost"
diff --git a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
new file mode 100644
index 0000000..f6a8683
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook-compute.inc
+
+OVERRIDES .= ":fb-compute-singlehost"
diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc
new file mode 100644
index 0000000..66b0f75
--- /dev/null
+++ b/meta-facebook/conf/machine/include/facebook-compute.inc
@@ -0,0 +1,3 @@
+require conf/machine/include/facebook.inc
+
+OVERRIDES .= ":fb-compute"
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index 97da01f..1e6ee08 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -3,7 +3,7 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-require conf/machine/include/facebook.inc
+require conf/machine/include/facebook-compute-singlehost.inc
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
index 97da01f..f2a6512 100644
--- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -3,7 +3,7 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-require conf/machine/include/facebook.inc
+require conf/machine/include/facebook-compute-multihost.inc
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc