diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 66432f4..b23f79c 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 8.7.0
+
+- Update Home Assistant CLI to 4.4.0
+- Upgrade Alpine Linux to 3.12
+
+
 ## 8.6.0
 
 - Add support for local TCP forwarding
diff --git a/ssh/build.json b/ssh/build.json
index ba4189b..e967799 100644
--- a/ssh/build.json
+++ b/ssh/build.json
@@ -1,13 +1,13 @@
 {
   "build_from": {
-    "aarch64": "homeassistant/aarch64-base:3.11",
-    "amd64": "homeassistant/amd64-base:3.11",
-    "armhf": "homeassistant/armhf-base:3.11",
-    "armv7": "homeassistant/armv7-base:3.11",
-    "i386": "homeassistant/i386-base:3.11"
+    "aarch64": "homeassistant/aarch64-base:3.12",
+    "amd64": "homeassistant/amd64-base:3.12",
+    "armhf": "homeassistant/armhf-base:3.12",
+    "armv7": "homeassistant/armv7-base:3.12",
+    "i386": "homeassistant/i386-base:3.12"
   },
   "args": {
-    "CLI_VERSION": "4.3.0",
+    "CLI_VERSION": "4.4.0",
     "LIBWEBSOCKETS_VERSION": "v3.2.2",
     "TTYD_VERSION": "1.6.0"
   }
diff --git a/ssh/config.json b/ssh/config.json
index 476ce32..5b1dfbb 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Terminal & SSH",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "slug": "ssh",
   "description": "Allow logging in remotely to Home Assistant using SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",