diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
index b2ec84b..6b61bba 100644
--- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
+++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
@@ -5,12 +5,15 @@
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = " \
-        ${PN}-chassis \
         ${PN}-extras \
         ${PN}-fans \
         ${PN}-flash \
         ${PN}-system \
         "
+PACKAGES_append_fb-withhost = " \
+        ${PN}-chassis \
+        ${PN}-hostmgmt \
+        "
 
 PROVIDES += "virtual/obmc-chassis-mgmt"
 PROVIDES += "virtual/obmc-fan-mgmt"
@@ -40,10 +43,8 @@
         phosphor-software-manager \
         "
 
-SUMMARY_${PN}-system = "Facebook System"
-RDEPENDS_${PN}-system = " \
-        entity-manager \
-        dbus-sensors \
+RDEPENDS_PN_SYSTEM_EXTRAS = ""
+RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \
         fb-powerctrl \
         phosphor-ipmi-ipmb \
         fb-ipmi-oem \
@@ -52,5 +53,12 @@
         ipmitool \
         phosphor-post-code-manager \
         phosphor-host-postd \
+        "
+
+SUMMARY_${PN}-system = "Facebook System"
+RDEPENDS_${PN}-system = " \
+        entity-manager \
+        dbus-sensors \
         phosphor-virtual-sensor \
+        ${RDEPENDS_PN_SYSTEM_EXTRAS} \
         "