diff --git a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh
index 934af16..d6cfea4 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh
@@ -6,7 +6,7 @@
 
 # Usage of this utility
 function usage() {
-  echo "usage: power-util mb [on|off|graceful_shutdown|host_reset|host_cycle|shutdown_ack|hotswap|power_button]";
+  echo "usage: power-util mb [on|off|graceful_shutdown|host_reset|host_cycle|shutdown_ack|hotswap]";
 }
 
 hotswap() {
@@ -100,26 +100,6 @@
   fi
 }
 
-power_button() {
-  echo "Power button trigger event."
-  current_time="$(timestamp)"
-  if [ -f "/run/openbmc/power-button" ]; then
-    echo "Power button released"
-    press_time="$(cat /run/openbmc/power-button)"
-    if [[ "$current_time" -le "(($press_time + 1))" ]]; then
-      power_on
-    elif [[ "$current_time" -ge "(($press_time + 5))" ]]; then
-      power_off
-    else
-      echo "Button press did not match interval."
-    fi
-    rm "/run/openbmc/power-button"
-  else
-    echo "Power button pressed"
-    timestamp > "/run/openbmc/power-button"
-  fi
-}
-
 if [ $# -lt 2 ]; then
   echo "Total number of parameter=$#"
   echo "Insufficient parameter"
@@ -156,8 +136,6 @@
   host_cycle
 elif [ "$2" == "shutdown_ack" ]; then
   shutdown_ack
-elif [ "$2" == "power_button" ]; then
-  power_button
 else
   echo "Invalid parameter2=$2"
   usage;
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 1df5241..60729e6 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
@@ -23,6 +23,8 @@
 SUMMARY:${PN}-kudo-chassis = "kudo chassis"
 RDEPENDS:${PN}-kudo-chassis = " \
     obmc-op-control-power \
+    obmc-phosphor-buttons-signals \
+    obmc-phosphor-buttons-handler \
     "
 
 SUMMARY:${PN}-kudo-system = "kudo System"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
index 47cb2cc..ad03a73 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
+++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
@@ -15,6 +15,16 @@
             "name": "PGOOD",
             "num": 200,
             "direction": "in"
+        },
+        {
+            "name": "POWER_BUTTON",
+            "num": 192,
+            "direction": "both"
+        },
+        {
+            "name": "RESET_BUTTON",
+            "num": 13,
+            "direction": "both"
         }
     ]
 }