diff --git a/meta-gbs/recipes-gbs/hotswap-power-cycle/files/hotswap-power-cycle.service b/meta-gbs/recipes-gbs/hotswap-power-cycle/files/hotswap-power-cycle.service
index 57724f3..054b2fe 100644
--- a/meta-gbs/recipes-gbs/hotswap-power-cycle/files/hotswap-power-cycle.service
+++ b/meta-gbs/recipes-gbs/hotswap-power-cycle/files/hotswap-power-cycle.service
@@ -2,13 +2,9 @@
 Description=Power Cycle by Hotswap Controller
 
 [Service]
-EnvironmentFile=/run/psu_timedelay
-ExecStartPre=sleep $PSU_HARDRESET_DELAY
-ExecStart=gpioset gpiochip6 26=1
-Restart=no
 Type=oneshot
-RemainAfterExit=true
-StandardOutput=syslog
+EnvironmentFile=-/run/psu_timedelay
+ExecStart=/usr/bin/tray_powercycle.sh
 
 [Install]
 WantedBy=gbmc-psu-hardreset.target
diff --git a/meta-gbs/recipes-gbs/hotswap-power-cycle/files/tray_powercycle.sh b/meta-gbs/recipes-gbs/hotswap-power-cycle/files/tray_powercycle.sh
new file mode 100644
index 0000000..5cbf49b
--- /dev/null
+++ b/meta-gbs/recipes-gbs/hotswap-power-cycle/files/tray_powercycle.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# PSU hard reset (power cycle) script.
+#
+# Power cycle the entire tray by setting the PSU hotswap reset (GPIO218) to high
+#
+# Global variable: PSU_HARDRESET_DELAY specifies the number of seconds to wait
+# before pulling the trigger. If not specified or zero, the script power cycles
+# immediately.
+main() {
+  # Sleep PSU_HARDRESET_DELAY seconds
+  local psu_delay=$((PSU_HARDRESET_DELAY))
+  if ((psu_delay > 0)); then
+    echo "Sleeping ${psu_delay} seconds before PSU hard reset!"
+    sleep "${psu_delay}"
+  fi
+
+  gpioset gpiochip6 26=1
+}
+
+# Exit without running main() if sourced
+return 0 2>/dev/null
+
+main "$@"
diff --git a/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb b/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb
index 1a20bee..6bf7bb6 100644
--- a/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb
+++ b/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb
@@ -9,11 +9,16 @@
 DEPENDS += "systemd"
 RDEPENDS_${PN} += "bash"
 
-SRC_URI = " file://hotswap-power-cycle.service"
+SRC_URI = " file://hotswap-power-cycle.service \
+            file://tray_powercycle.sh \
+          "
 
 do_install() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/hotswap-power-cycle.service ${D}${systemd_system_unitdir}
+
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/tray_powercycle.sh ${D}${bindir}
 }
 
 SYSTEMD_PACKAGES = "${PN}"