diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index b23f79c..345c9a6 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 8.8.0
+
+- Update Home Assistant CLI to 4.4.1
+- Wrap system shutdown/reboot to supervisor
+
 ## 8.7.0
 
 - Update Home Assistant CLI to 4.4.0
diff --git a/ssh/build.json b/ssh/build.json
index e967799..1c80b48 100644
--- a/ssh/build.json
+++ b/ssh/build.json
@@ -7,7 +7,7 @@
     "i386": "homeassistant/i386-base:3.12"
   },
   "args": {
-    "CLI_VERSION": "4.4.0",
+    "CLI_VERSION": "4.4.1",
     "LIBWEBSOCKETS_VERSION": "v3.2.2",
     "TTYD_VERSION": "1.6.0"
   }
diff --git a/ssh/config.json b/ssh/config.json
index 5b1dfbb..1696657 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Terminal & SSH",
-  "version": "8.7.0",
+  "version": "8.8.0",
   "slug": "ssh",
   "description": "Allow logging in remotely to Home Assistant using SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",
diff --git a/ssh/rootfs/etc/fix-attrs.d/cli b/ssh/rootfs/etc/fix-attrs.d/cli
index d6ec390..dbd6e17 100644
--- a/ssh/rootfs/etc/fix-attrs.d/cli
+++ b/ssh/rootfs/etc/fix-attrs.d/cli
@@ -1,2 +1,4 @@
 /usr/bin/hassio false root 0755 0755
-/usr/bin/ha false root 0755 0755
\ No newline at end of file
+/usr/bin/ha false root 0755 0755
+/usr/local/bin/reboot false root 0755 0755
+/usr/local/bin/shutdown false root 0755 0755
diff --git a/ssh/rootfs/etc/fix-attrs.d/profile b/ssh/rootfs/etc/fix-attrs.d/profile
index de3e5cd..45857cb 100644
--- a/ssh/rootfs/etc/fix-attrs.d/profile
+++ b/ssh/rootfs/etc/fix-attrs.d/profile
@@ -1,2 +1,2 @@
 /data/.bash_history false root 0600 0755
-/data/.bash_profile false root 0600 0755
\ No newline at end of file
+/data/.bash_profile false root 0600 0755
diff --git a/ssh/rootfs/etc/fix-attrs.d/ssh b/ssh/rootfs/etc/fix-attrs.d/ssh
index a88f7bd..a6fdf24 100644
--- a/ssh/rootfs/etc/fix-attrs.d/ssh
+++ b/ssh/rootfs/etc/fix-attrs.d/ssh
@@ -1,3 +1,3 @@
 /data/.ssh false root 0644 0700
 /data/.ssh/authorized_keys false root 0600 0755
-/etc/ssh false root 0644 0755
\ No newline at end of file
+/etc/ssh false root 0644 0755
diff --git a/ssh/rootfs/usr/local/bin/reboot b/ssh/rootfs/usr/local/bin/reboot
new file mode 100644
index 0000000..8ab1828
--- /dev/null
+++ b/ssh/rootfs/usr/local/bin/reboot
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# This script overrides the reboot command to reboot the host machine.
+# ==============================================================================
+bashio::host.reboot
diff --git a/ssh/rootfs/usr/local/bin/shutdown b/ssh/rootfs/usr/local/bin/shutdown
new file mode 100644
index 0000000..8dc27e3
--- /dev/null
+++ b/ssh/rootfs/usr/local/bin/shutdown
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# This script overrides the shutdown command to shutdown the host machine.
+# ==============================================================================
+bashio::host.shutdown