diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index 153546733..c39c5c779 100644
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base:15.0.8
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -18,62 +18,62 @@ ARG TTYD_VERSION="1.7.7"
 # hadolint ignore=DL3003,DL3042
 RUN \
     apk add --no-cache --virtual .build-dependencies \
-        bsd-compat-headers=0.7.2-r5 \
+        bsd-compat-headers=0.7.2-r6 \
         build-base=0.5-r3 \
-        cmake=3.27.8-r0 \
-        docker=25.0.5-r1 \
+        cmake=3.29.3-r0 \
+        docker=26.1.3-r0 \
         json-c-dev=0.17-r0 \
-        libffi-dev=3.4.4-r3 \
-        libuv-dev=1.47.0-r0 \
-        openssl-dev=3.1.5-r0 \
-        python3-dev=3.11.9-r0 \
-        zlib-dev=1.3.1-r0 \
+        libffi-dev=3.4.6-r0 \
+        libuv-dev=1.48.0-r0 \
+        openssl-dev=3.3.0-r2 \
+        python3-dev=3.12.3-r1 \
+        zlib-dev=1.3.1-r1 \
     \
     && apk add --no-cache \
         ack=3.7.0-r1 \
-        alsa-plugins-pulse=1.2.7.1-r2 \
-        alsa-utils=1.2.10-r0 \
-        awake=1.0-r9 \
-        bash-completion=2.11-r6 \
-        bind-tools=9.18.24-r1 \
-        bluez=5.70-r0 \
+        alsa-plugins-pulse=1.2.7.1-r3 \
+        alsa-utils=1.2.11-r1 \
+        awake=1.0-r10 \
+        bash-completion=2.12.0-r0 \
+        bind-tools=9.18.27-r0 \
+        bluez=5.76-r0 \
         colordiff=1.0.21-r0 \
-        docker-bash-completion=25.0.5-r1 \
-        docker-zsh-completion=25.0.5-r1 \
+        docker-bash-completion=26.1.3-r0 \
+        docker-zsh-completion=26.1.3-r0 \
         gcompat=1.1.0-r4 \
-        git=2.43.4-r0 \
-        htop=3.2.2-r1 \
+        git=2.45.1-r0 \
+        htop=3.3.0-r0 \
         json-c=0.17-r0 \
         libltdl=2.4.7-r3 \
-        libstdc++=13.2.1_git20231014-r0 \
-        libuv=1.47.0-r0 \
-        libxml2-utils=2.11.8-r0 \
-        mariadb-client=10.11.6-r0 \
-        mosh=1.4.0-r6 \
+        libstdc++=13.2.1_git20240309-r0 \
+        libuv=1.48.0-r0 \
+        libxml2-utils=2.12.7-r0 \
+        mariadb-client=10.11.8-r0 \
+        mosh=1.4.0-r8 \
         mosquitto-clients=2.0.18-r0 \
-        nano-syntax=7.2-r1 \
-        nano=7.2-r1 \
-        ncurses=6.4_p20231125-r0 \
+        nano-syntax=8.0-r0 \
+        nano=8.0-r0 \
+        ncurses=6.4_p20240420-r0 \
         net-tools=2.10-r3 \
-        networkmanager-cli=1.44.4-r0 \
-        nmap=7.94-r0 \
-        openssh=9.6_p1-r0 \
-        openssl=3.1.5-r0 \
+        networkmanager-cli=1.46.0-r0 \
+        nmap=7.95-r0 \
+        openssh=9.7_p1-r3 \
+        openssl=3.3.0-r2 \
         procps-ng=4.0.4-r0 \
         pwgen=2.08-r3 \
-        pulseaudio-utils=16.1-r11 \
-        py3-pip=23.3.1-r0 \
-        python3=3.11.9-r0 \
-        rsync=3.2.7-r4 \
-        sqlite=3.44.2-r0 \
-        sudo=1.9.15_p2-r0 \
-        tmux=3.3a_git20230428-r0 \
-        vim=9.0.2127-r0 \
-        wget=1.21.4-r0 \
+        pulseaudio-utils=17.0-r0 \
+        py3-pip=24.0-r2 \
+        python3=3.12.3-r1 \
+        rsync=3.3.0-r0 \
+        sqlite=3.45.3-r1 \
+        sudo=1.9.15_p5-r0 \
+        tmux=3.4-r1 \
+        vim=9.1.0414-r0 \
+        wget=1.24.5-r0 \
         zip=3.0-r12 \
         zsh-autosuggestions=0.7.0-r0 \
-        zsh-syntax-highlighting=0.7.1_git20220514-r0 \
-        zsh=5.9-r2 \
+        zsh-syntax-highlighting=0.8.0-r0 \
+        zsh=5.9-r3 \
     \
     && git clone --depth 1 \
         https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \
diff --git a/ssh/build.yaml b/ssh/build.yaml
index 243e4a0f1..dae34aaea 100644
--- a/ssh/build.yaml
+++ b/ssh/build.yaml
@@ -1,8 +1,8 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base:15.0.8
-  amd64: ghcr.io/hassio-addons/base:15.0.8
-  armv7: ghcr.io/hassio-addons/base:15.0.8
+  aarch64: ghcr.io/hassio-addons/base:16.0.0
+  amd64: ghcr.io/hassio-addons/base:16.0.0
+  armv7: ghcr.io/hassio-addons/base:16.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev