diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb
deleted file mode 100644
index 645847b..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "Ampere Computing LLC Host Gpio Handling"
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit obmc-phosphor-systemd
-
-DEPENDS += "phosphor-gpio-monitor"
-RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
-RDEPENDS:${PN} += "bash"
-
-AMPERE_MONITOR_INSTANCES = " \
-                            S0_hightemp_start S0_hightemp_stop \
-                            S1_hightemp_start S1_hightemp_stop \
-                           "
-
-SYSTEMD_ENVIRONMENT_FILE:${PN} +=" \
-                                  obmc/gpio/S0_hightemp_start \
-                                  obmc/gpio/S0_hightemp_stop \
-                                  obmc/gpio/S1_hightemp_start \
-                                  obmc/gpio/S1_hightemp_stop \
-                                 "
-
-TMPL = "phosphor-gpio-monitor@.service"
-INSTFMT = "phosphor-gpio-monitor@{0}.service"
-TGT = "multi-user.target"
-FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE:${PN} += " \
-                          ampere_hightemp_start@.service \
-                          ampere_hightemp_stop@.service \
-                         "
-SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'AMPERE_MONITOR_INSTANCES')}"
-
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_start b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_start
deleted file mode 100644
index 44dc221..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_start
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=72
-POLARITY=1
-TARGET=ampere_hightemp_start@0.service
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_stop b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_stop
deleted file mode 100644
index ccd0519..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S0_hightemp_stop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=72
-POLARITY=0
-TARGET=ampere_hightemp_stop@0.service
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_start b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_start
deleted file mode 100644
index 901eb00..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_start
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=216
-POLARITY=1
-TARGET=ampere_hightemp_start@1.service
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_stop b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_stop
deleted file mode 100644
index f1b4cc1..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/obmc/gpio/S1_hightemp_stop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=216
-POLARITY=0
-TARGET=ampere_hightemp_start@1.service
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_start@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service
similarity index 100%
rename from meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_start@.service
rename to meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_stop@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service
similarity index 100%
rename from meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling/ampere_hightemp_stop@.service
rename to meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
index 7b89a14..66c3dcb 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
@@ -30,6 +30,26 @@
         "Continue": true
     },
     {
+        "Name": "S0_HIGHTEMP",
+        "LineName": "S0_HIGHTEMP_L",
+        "EventMon": "BOTH",
+        "Targets": {
+          "FALLING": ["ampere_hightemp_start@0.service"],
+          "RISING": ["ampere_hightemp_stop@0.service"]
+        },
+        "Continue": true
+    },
+    {
+        "Name": "S1_HIGHTEMP",
+        "LineName": "S1_HIGHTEMP_L",
+        "EventMon": "BOTH",
+        "Targets": {
+          "FALLING": ["ampere_hightemp_start@1.service"],
+          "RISING": ["ampere_hightemp_stop@1.service"]
+        },
+        "Continue": true
+    },
+    {
         "Name": "S0_SCP_AUTH_FAIL",
         "LineName": "S0_SCP_AUTH_FAIL_L",
         "EventMon": "FALLING",
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index f798fee..2a9ed5b 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -15,6 +15,8 @@
 SYSTEMD_SERVICE:${PN}-monitor += " \
                                   ampere-host-shutdown-ack@.service \
                                   ampere_overtemp@.service \
+                                  ampere_hightemp_start@.service \
+                                  ampere_hightemp_stop@.service \
                                   ampere_scp_failover.service \
                                   psu_hotswap_reset@.service \
                                  "
diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 5e726c3..b3db542 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -3,7 +3,7 @@
                                 phosphor-image-signing \
                                 phosphor-virtual-sensor \
                                 phosphor-misc-usb-ctrl \
-                                ampere-gpio-handling \
+                                phosphor-gpio-monitor-monitor \
                                "
 
 RDEPENDS:${PN}-inventory:append = " \