diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf
index 792e63c..bcdbdfd 100644
--- a/meta-fii/meta-kudo/conf/machine/kudo.conf
+++ b/meta-fii/meta-kudo/conf/machine/kudo.conf
@@ -26,6 +26,7 @@
     obmc-host-ipmi \
     obmc-phosphor-fan-mgmt \
     obmc-phosphor-flash-mgmt \
+    obmc-phosphor-chassis-mgmt \
     "
 
 PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control"
@@ -33,5 +34,6 @@
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps"
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-kudo-apps"
 # Remove unneeded binaries from image
 IMAGE_FEATURES:remove = "obmc-health-monitor"
diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
index a46e3a0..d2e3ebd 100644
--- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
@@ -11,9 +11,11 @@
     ${PN}-fan-mgmt \
     "
 
+PROVIDES += "virtual/obmc-chassis-mgmt"
 PROVIDES += "virtual/obmc-system-mgmt"
 PROVIDES += "virtual/obmc-fan-mgmt"
 
+RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt"
 RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt"
 RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
 RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
@@ -22,8 +24,6 @@
 RDEPENDS:${PN}-kudo-chassis = " \
     phosphor-hostlogger \
     obmc-op-control-power \
-    obmc-phosphor-buttons-signals \
-    obmc-phosphor-buttons-handler \
     "
 
 SUMMARY:${PN}-kudo-system = "kudo System"