diff --git a/conf/machine/include/facebook.inc b/conf/machine/include/facebook.inc
new file mode 100644
index 0000000..9b6e3ef
--- /dev/null
+++ b/conf/machine/include/facebook.inc
@@ -0,0 +1,22 @@
+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"
+
+OVERRIDES .= ":facebook"
diff --git a/meta-tiogapass/conf/machine/tiogapass.conf b/meta-tiogapass/conf/machine/tiogapass.conf
index 9c7a39a..97da01f 100644
--- a/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-tiogapass/conf/machine/tiogapass.conf
@@ -3,24 +3,11 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
+require conf/machine/include/facebook.inc
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 
 SERIAL_CONSOLES = "57600;ttyS4"
 
-OBMC_MACHINE_FEATURES += "\
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-flash-mgmt \
-        obmc-host-ipmi \
-        obmc-host-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-bmc-state-mgmt \
-        "
 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"
diff --git a/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-yosemitev2/conf/machine/yosemitev2.conf
index d37fc56..97da01f 100644
--- a/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -3,22 +3,11 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
+require conf/machine/include/facebook.inc
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 
 SERIAL_CONSOLES = "57600;ttyS4"
 
-OBMC_MACHINE_FEATURES += "\
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-flash-mgmt \
-        obmc-host-ipmi \
-        obmc-host-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-bmc-state-mgmt \
-        "
 PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps"
 FLASH_SIZE = "32768"
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-
diff --git a/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/recipes-fb/packagegroups/packagegroup-fb-apps.bb
index 1709ac2..1dcc7cb 100644
--- a/recipes-fb/packagegroups/packagegroup-fb-apps.bb
+++ b/recipes-fb/packagegroups/packagegroup-fb-apps.bb
@@ -5,13 +5,37 @@
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = " \
+        ${PN}-chassis \
+        ${PN}-fans \
+        ${PN}-flash \
         ${PN}-system \
         "
 
+PROVIDES += "virtual/obmc-chassis-mgmt"
+PROVIDES += "virtual/obmc-fan-mgmt"
+PROVIDES += "virtual/obmc-flash-mgmt"
 PROVIDES += "virtual/obmc-system-mgmt"
 
+RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
 RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
 
+SUMMARY_${PN}-chassis = "Facebook Chassis"
+RDEPENDS_${PN}-chassis = " \
+        x86-power-control \
+        "
+
+SUMMARY_${PN}-fans = "Facebook Fans"
+RDEPENDS_${PN}-fans = " \
+        phosphor-pid-control \
+        "
+
+SUMMARY_${PN}-flash = "Facebook Flash"
+RDEPENDS_${PN}-flash = " \
+        phosphor-software-manager \
+        "
+
 SUMMARY_${PN}-system = "Facebook System"
 RDEPENDS_${PN}-system = " \
         entity-manager \
@@ -19,7 +43,6 @@
         fb-powerctrl \
         phosphor-ipmi-ipmb \
         fb-ipmi-oem \
-        phosphor-pid-control \
         phosphor-hostlogger \
         phosphor-sel-logger \
         ipmitool \