diff --git a/README.md b/README.md
index 064a1a39..c7c297bd 100644
--- a/README.md
+++ b/README.md
@@ -215,63 +215,62 @@ Some come from the parent images and some are installed in this image for backwa
 
 |                               | git | curl | tar | bash | which | gzip | procps | gpg | ssh |
 |-------------------------------|-----|------|-----|------|-------|------|--------|-----|-----|
-| amazoncorretto-8              |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-8-al2023       |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-8-debian       |     |      | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| amazoncorretto-11             |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-11-al2023      |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-11-debian      |     |      | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| amazoncorretto-17             |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-17-al2023      |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-17-debian      |     |      | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| amazoncorretto-21             |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-21-al2023      |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| amazoncorretto-21-debian      |     |      | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| azulzulu-8                    |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-8-alpine             |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-11                   |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-11-alpine            |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-17                   |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-17-alpine            |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-21                   |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| azulzulu-21-alpine            |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-8             | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-8-alpine      |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-8-focal       | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-11            | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-11-alpine     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-11-focal      | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-17            | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-17-alpine     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-17-focal      | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-21            | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-21-alpine     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-22-jammy      | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-22            | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-22-alpine     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| eclipse-temurin-22-jammy      | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| graalvm-community-17          |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| graalvm-community-21          |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| ibm-semeru-11-focal           | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| ibm-semeru-17-focal           | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| ibm-semeru-21-jammy           | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| ibmjava-8                     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| libericaopenjdk-8-alpine      |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| libericaopenjdk-8-debian      |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| libericaopenjdk-11-alpine     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| libericaopenjdk-11-debian     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| libericaopenjdk-17-alpine     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| libericaopenjdk-17-debian     |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        |     |     |
-| microsoft-openjdk-11-ubuntu   | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      | ✔️   |     |
-| microsoft-openjdk-17-ubuntu   | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      | ✔️   |     |
-| microsoft-openjdk-21-ubuntu   | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      | ✔️   |     |
-| oracle-graalvm-17             |     | ✔️    | ✔️   | ✔️    |       | ✔️    |        | ✔️   |     |
-| oracle-graalvm-21             |     | ✔️    | ✔️   | ✔️    |       | ✔️    |        | ✔️   |     |
-| sapmachine-11                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| sapmachine-17                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| sapmachine-21                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-| sapmachine-22                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
-
+| amazoncorretto-8              |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-8-al2023       |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-8-debian       |     |      | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| amazoncorretto-11             |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-11-al2023      |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-11-debian      |     |      | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| amazoncorretto-17             |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-17-al2023      |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-17-debian      |     |      | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| amazoncorretto-21             |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-21-al2023      |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| amazoncorretto-21-debian      |     |      | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| azulzulu-8                    |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-8-alpine             |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-11                   |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-11-alpine            |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-17                   |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-17-alpine            |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-21                   |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| azulzulu-21-alpine            |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-8             | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-8-alpine      |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-8-focal       | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-11            | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-11-alpine     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-11-focal      | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-17            | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-17-alpine     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-17-focal      | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-21            | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-21-alpine     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-22-jammy      | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-22            | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-22-alpine     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| eclipse-temurin-22-jammy      | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| graalvm-community-17          |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| graalvm-community-21          |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        | ✔︎   | ✔︎   |
+| ibm-semeru-11-focal           | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| ibm-semeru-17-focal           | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| ibm-semeru-21-jammy           | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| ibmjava-8                     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| libericaopenjdk-8-alpine      |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| libericaopenjdk-8-debian      |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| libericaopenjdk-11-alpine     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| libericaopenjdk-11-debian     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| libericaopenjdk-17-alpine     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| libericaopenjdk-17-debian     |     | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    |        |     | ✔︎   |
+| microsoft-openjdk-11-ubuntu   | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      | ✔︎   | ✔︎   |
+| microsoft-openjdk-17-ubuntu   | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      | ✔︎   | ✔︎   |
+| microsoft-openjdk-21-ubuntu   | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      | ✔︎   | ✔︎   |
+| oracle-graalvm-17             |     | ✔︎    | ✔︎   | ✔︎    |       | ✔︎    |        | ✔︎   | ✔︎   |
+| oracle-graalvm-21             |     | ✔︎    | ✔︎   | ✔︎    |       | ✔︎    |        | ✔︎   | ✔︎   |
+| sapmachine-11                 | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| sapmachine-17                 | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| sapmachine-21                 | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
+| sapmachine-22                 | ✔︎   | ✔︎    | ✔︎   | ✔︎    | ✔︎     | ✔︎    | ✔︎      |     | ✔︎   |
 
 
 # Image Verification
diff --git a/amazoncorretto-11-al2023/Dockerfile b/amazoncorretto-11-al2023/Dockerfile
index 515a27fc..b1554360 100644
--- a/amazoncorretto-11-al2023/Dockerfile
+++ b/amazoncorretto-11-al2023/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:11-al2023
 
 RUN yum install -y tar which gzip findutils # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-11-debian/Dockerfile b/amazoncorretto-11-debian/Dockerfile
index 468f20c7..45f450ef 100644
--- a/amazoncorretto-11-debian/Dockerfile
+++ b/amazoncorretto-11-debian/Dockerfile
@@ -3,8 +3,9 @@
 FROM debian:bookworm-slim
 
 # install corretto after verifying that the key is the one we expect.
+# and keep openssh client
 RUN apt-get update \
-  && apt-get install -y curl gnupg \
+  && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key | gpg --batch --import \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \
diff --git a/amazoncorretto-11/Dockerfile b/amazoncorretto-11/Dockerfile
index 567a89a2..c1d2f0e5 100644
--- a/amazoncorretto-11/Dockerfile
+++ b/amazoncorretto-11/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:11
 
 RUN yum install -y tar which gzip # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-17-al2023/Dockerfile b/amazoncorretto-17-al2023/Dockerfile
index 2d2984fe..c9ae0aa5 100644
--- a/amazoncorretto-17-al2023/Dockerfile
+++ b/amazoncorretto-17-al2023/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:17-al2023
 
 RUN yum install -y tar which gzip findutils # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-17-debian/Dockerfile b/amazoncorretto-17-debian/Dockerfile
index e49dbb0c..ce0bdbb4 100644
--- a/amazoncorretto-17-debian/Dockerfile
+++ b/amazoncorretto-17-debian/Dockerfile
@@ -3,8 +3,9 @@
 FROM debian:bookworm-slim
 
 # install corretto after verifying that the key is the one we expect.
+# and keep openssh client
 RUN apt-get update \
-  && apt-get install -y curl gnupg \
+  && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key | gpg --batch --import \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \
diff --git a/amazoncorretto-17/Dockerfile b/amazoncorretto-17/Dockerfile
index 99f50e59..6802d3f8 100644
--- a/amazoncorretto-17/Dockerfile
+++ b/amazoncorretto-17/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:17
 
 RUN yum install -y tar which gzip # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-21-al2023/Dockerfile b/amazoncorretto-21-al2023/Dockerfile
index 58e83f50..854a6784 100644
--- a/amazoncorretto-21-al2023/Dockerfile
+++ b/amazoncorretto-21-al2023/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:21-al2023
 
 RUN yum install -y tar which gzip findutils # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-21-debian/Dockerfile b/amazoncorretto-21-debian/Dockerfile
index 81d749d0..95bd6989 100644
--- a/amazoncorretto-21-debian/Dockerfile
+++ b/amazoncorretto-21-debian/Dockerfile
@@ -3,8 +3,9 @@
 FROM debian:bookworm-slim
 
 # install corretto after verifying that the key is the one we expect.
+# and keep openssh client
 RUN apt-get update \
-  && apt-get install -y curl gnupg \
+  && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key | gpg --batch --import \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \
diff --git a/amazoncorretto-21/Dockerfile b/amazoncorretto-21/Dockerfile
index c4825ba7..37325c2a 100644
--- a/amazoncorretto-21/Dockerfile
+++ b/amazoncorretto-21/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:21
 
 RUN yum install -y tar which gzip # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-8-al2023/Dockerfile b/amazoncorretto-8-al2023/Dockerfile
index 530fc019..9d874b47 100644
--- a/amazoncorretto-8-al2023/Dockerfile
+++ b/amazoncorretto-8-al2023/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:8-al2023
 
 RUN yum install -y tar which gzip findutils # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/amazoncorretto-8-debian/Dockerfile b/amazoncorretto-8-debian/Dockerfile
index eb45713f..3373ba8e 100644
--- a/amazoncorretto-8-debian/Dockerfile
+++ b/amazoncorretto-8-debian/Dockerfile
@@ -3,8 +3,9 @@
 FROM debian:bookworm-slim
 
 # install corretto after verifying that the key is the one we expect.
+# and keep openssh client
 RUN apt-get update \
-  && apt-get install -y curl gnupg \
+  && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key | gpg --batch --import \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \
diff --git a/amazoncorretto-8/Dockerfile b/amazoncorretto-8/Dockerfile
index 4eb103ff..13262f66 100644
--- a/amazoncorretto-8/Dockerfile
+++ b/amazoncorretto-8/Dockerfile
@@ -1,6 +1,7 @@
 FROM amazoncorretto:8
 
 RUN yum install -y tar which gzip # TODO remove
+RUN yum install -y openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/azulzulu-11-alpine/Dockerfile b/azulzulu-11-alpine/Dockerfile
index 669eeaf7..d3929b95 100644
--- a/azulzulu-11-alpine/Dockerfile
+++ b/azulzulu-11-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM azul/zulu-openjdk-alpine:11
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/azulzulu-11/Dockerfile b/azulzulu-11/Dockerfile
index 12f41c43..d7b91a64 100644
--- a/azulzulu-11/Dockerfile
+++ b/azulzulu-11/Dockerfile
@@ -1,7 +1,7 @@
 FROM azul/zulu-openjdk:11
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl --no-install-recommends \
+  && apt-get install -y ca-certificates curl openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/azulzulu-17-alpine/Dockerfile b/azulzulu-17-alpine/Dockerfile
index 06297156..c70037e6 100644
--- a/azulzulu-17-alpine/Dockerfile
+++ b/azulzulu-17-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM azul/zulu-openjdk-alpine:17
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/azulzulu-17/Dockerfile b/azulzulu-17/Dockerfile
index c649e43c..613c1c23 100644
--- a/azulzulu-17/Dockerfile
+++ b/azulzulu-17/Dockerfile
@@ -1,7 +1,7 @@
 FROM azul/zulu-openjdk:17
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl --no-install-recommends \
+  && apt-get install -y ca-certificates curl openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/azulzulu-21-alpine/Dockerfile b/azulzulu-21-alpine/Dockerfile
index afd0869d..304daf62 100644
--- a/azulzulu-21-alpine/Dockerfile
+++ b/azulzulu-21-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM azul/zulu-openjdk-alpine:21
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/azulzulu-21/Dockerfile b/azulzulu-21/Dockerfile
index 8814d946..3517f716 100644
--- a/azulzulu-21/Dockerfile
+++ b/azulzulu-21/Dockerfile
@@ -1,7 +1,7 @@
 FROM azul/zulu-openjdk:21
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl --no-install-recommends \
+  && apt-get install -y ca-certificates curl openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/azulzulu-8-alpine/Dockerfile b/azulzulu-8-alpine/Dockerfile
index 4c0f1df4..6ab2a960 100644
--- a/azulzulu-8-alpine/Dockerfile
+++ b/azulzulu-8-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM azul/zulu-openjdk-alpine:8
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/azulzulu-8/Dockerfile b/azulzulu-8/Dockerfile
index 16c031c7..d617b701 100644
--- a/azulzulu-8/Dockerfile
+++ b/azulzulu-8/Dockerfile
@@ -1,7 +1,7 @@
 FROM azul/zulu-openjdk:8
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl --no-install-recommends \
+  && apt-get install -y ca-certificates curl openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-11-alpine/Dockerfile b/eclipse-temurin-11-alpine/Dockerfile
index 8cdaf727..d456e0b2 100644
--- a/eclipse-temurin-11-alpine/Dockerfile
+++ b/eclipse-temurin-11-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:11-jdk-alpine
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/eclipse-temurin-11-focal/Dockerfile b/eclipse-temurin-11-focal/Dockerfile
index e9bff9c1..fe6beef2 100644
--- a/eclipse-temurin-11-focal/Dockerfile
+++ b/eclipse-temurin-11-focal/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:11-jdk-focal
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-11/Dockerfile b/eclipse-temurin-11/Dockerfile
index 73fe5878..78d32358 100644
--- a/eclipse-temurin-11/Dockerfile
+++ b/eclipse-temurin-11/Dockerfile
@@ -33,7 +33,7 @@ RUN mvn --version
 FROM eclipse-temurin:11-jdk
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/eclipse-temurin-17-alpine/Dockerfile b/eclipse-temurin-17-alpine/Dockerfile
index 52fc766f..b861d112 100644
--- a/eclipse-temurin-17-alpine/Dockerfile
+++ b/eclipse-temurin-17-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:17-jdk-alpine
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/eclipse-temurin-17-focal/Dockerfile b/eclipse-temurin-17-focal/Dockerfile
index a6ca9351..ae7b9277 100644
--- a/eclipse-temurin-17-focal/Dockerfile
+++ b/eclipse-temurin-17-focal/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:17-jdk-focal
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-17/Dockerfile b/eclipse-temurin-17/Dockerfile
index 3b9bc2ee..8e543272 100644
--- a/eclipse-temurin-17/Dockerfile
+++ b/eclipse-temurin-17/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:17-jdk
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-21-alpine/Dockerfile b/eclipse-temurin-21-alpine/Dockerfile
index 8e553906..956be79a 100644
--- a/eclipse-temurin-21-alpine/Dockerfile
+++ b/eclipse-temurin-21-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:21-jdk-alpine
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/eclipse-temurin-21-jammy/Dockerfile b/eclipse-temurin-21-jammy/Dockerfile
index 6d07534e..50ce96f3 100644
--- a/eclipse-temurin-21-jammy/Dockerfile
+++ b/eclipse-temurin-21-jammy/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:21-jdk-jammy
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-21/Dockerfile b/eclipse-temurin-21/Dockerfile
index dfb43f2e..b6779f56 100644
--- a/eclipse-temurin-21/Dockerfile
+++ b/eclipse-temurin-21/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:21-jdk
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-22-alpine/Dockerfile b/eclipse-temurin-22-alpine/Dockerfile
index 3304dad9..2b38719d 100644
--- a/eclipse-temurin-22-alpine/Dockerfile
+++ b/eclipse-temurin-22-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:22-jdk-alpine
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/eclipse-temurin-22-jammy/Dockerfile b/eclipse-temurin-22-jammy/Dockerfile
index c94ad6c3..3ebc3a67 100644
--- a/eclipse-temurin-22-jammy/Dockerfile
+++ b/eclipse-temurin-22-jammy/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:22-jdk-jammy
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-22/Dockerfile b/eclipse-temurin-22/Dockerfile
index d9b37601..99729091 100644
--- a/eclipse-temurin-22/Dockerfile
+++ b/eclipse-temurin-22/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:22-jdk
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-8-alpine/Dockerfile b/eclipse-temurin-8-alpine/Dockerfile
index d568ae5e..afb1bece 100644
--- a/eclipse-temurin-8-alpine/Dockerfile
+++ b/eclipse-temurin-8-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:8-jdk-alpine
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/eclipse-temurin-8-focal/Dockerfile b/eclipse-temurin-8-focal/Dockerfile
index 76708e2b..7bb47526 100644
--- a/eclipse-temurin-8-focal/Dockerfile
+++ b/eclipse-temurin-8-focal/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:8-jdk-focal
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/eclipse-temurin-8/Dockerfile b/eclipse-temurin-8/Dockerfile
index 10046616..722022f2 100644
--- a/eclipse-temurin-8/Dockerfile
+++ b/eclipse-temurin-8/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:8-jdk
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/graalvm-community-17/Dockerfile b/graalvm-community-17/Dockerfile
index f32f856d..a2d7d9d2 100644
--- a/graalvm-community-17/Dockerfile
+++ b/graalvm-community-17/Dockerfile
@@ -1,10 +1,11 @@
 FROM ghcr.io/graalvm/graalvm-community:17
 
+RUN microdnf --refresh -y install findutils openssh-clients
 # common for all images
-LABEL org.opencontainers.image.title "Apache Maven"
-LABEL org.opencontainers.image.source https://github.com/carlossg/docker-maven
-LABEL org.opencontainers.image.url https://github.com/carlossg/docker-maven
-LABEL org.opencontainers.image.description "Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information."
+LABEL org.opencontainers.image.title="Apache Maven"
+LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven
+LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven
+LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information."
 
 ENV MAVEN_HOME /usr/share/maven
 
diff --git a/graalvm-community-21/Dockerfile b/graalvm-community-21/Dockerfile
index 9e0973f8..816a3682 100644
--- a/graalvm-community-21/Dockerfile
+++ b/graalvm-community-21/Dockerfile
@@ -1,10 +1,12 @@
 FROM ghcr.io/graalvm/graalvm-community:21
 
+RUN microdnf --refresh -y install findutils openssh-clients
+
 # common for all images
-LABEL org.opencontainers.image.title "Apache Maven"
-LABEL org.opencontainers.image.source https://github.com/carlossg/docker-maven
-LABEL org.opencontainers.image.url https://github.com/carlossg/docker-maven
-LABEL org.opencontainers.image.description "Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information."
+LABEL org.opencontainers.image.title="Apache Maven"
+LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven
+LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven
+LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information."
 
 ENV MAVEN_HOME /usr/share/maven
 
diff --git a/ibm-semeru-11-focal/Dockerfile b/ibm-semeru-11-focal/Dockerfile
index 1aaa0a91..8c41cf4a 100644
--- a/ibm-semeru-11-focal/Dockerfile
+++ b/ibm-semeru-11-focal/Dockerfile
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-11-jdk-focal
 
 RUN apt-get update \
-  && apt-get install -y git --no-install-recommends \
+  && apt-get install -y git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/ibm-semeru-17-focal/Dockerfile b/ibm-semeru-17-focal/Dockerfile
index 4f2512c0..b79c82c4 100644
--- a/ibm-semeru-17-focal/Dockerfile
+++ b/ibm-semeru-17-focal/Dockerfile
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-17-jdk-focal
 
 RUN apt-get update \
-  && apt-get install -y git --no-install-recommends \
+  && apt-get install -y git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/ibm-semeru-21-jammy/Dockerfile b/ibm-semeru-21-jammy/Dockerfile
index a4b2bd4d..0d76c816 100644
--- a/ibm-semeru-21-jammy/Dockerfile
+++ b/ibm-semeru-21-jammy/Dockerfile
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-21-jdk-jammy
 
 RUN apt-get update \
-  && apt-get install -y git --no-install-recommends \
+  && apt-get install -y git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/ibmjava-8/Dockerfile b/ibmjava-8/Dockerfile
index b0dea89d..b5e5dd13 100644
--- a/ibmjava-8/Dockerfile
+++ b/ibmjava-8/Dockerfile
@@ -1,7 +1,7 @@
 FROM ibmjava:8-sdk
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl --no-install-recommends \
+  && apt-get install -y ca-certificates curl openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/libericaopenjdk-11-alpine/Dockerfile b/libericaopenjdk-11-alpine/Dockerfile
index 58b45228..9e1caaae 100644
--- a/libericaopenjdk-11-alpine/Dockerfile
+++ b/libericaopenjdk-11-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM bellsoft/liberica-openjdk-alpine:11
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/libericaopenjdk-11-debian/Dockerfile b/libericaopenjdk-11-debian/Dockerfile
index de5cc076..6a63f1c9 100644
--- a/libericaopenjdk-11-debian/Dockerfile
+++ b/libericaopenjdk-11-debian/Dockerfile
@@ -1,7 +1,7 @@
 FROM bellsoft/liberica-openjdk-debian:11
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+  && apt-get install -y openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/libericaopenjdk-17-alpine/Dockerfile b/libericaopenjdk-17-alpine/Dockerfile
index facc8e66..8afdec67 100644
--- a/libericaopenjdk-17-alpine/Dockerfile
+++ b/libericaopenjdk-17-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM bellsoft/liberica-openjdk-alpine:17
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/libericaopenjdk-17-debian/Dockerfile b/libericaopenjdk-17-debian/Dockerfile
index a33d0927..ef44b7dd 100644
--- a/libericaopenjdk-17-debian/Dockerfile
+++ b/libericaopenjdk-17-debian/Dockerfile
@@ -1,7 +1,7 @@
 FROM bellsoft/liberica-openjdk-debian:17
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+  && apt-get install -y openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/libericaopenjdk-8-alpine/Dockerfile b/libericaopenjdk-8-alpine/Dockerfile
index 1e3a00b7..e27e7a2c 100644
--- a/libericaopenjdk-8-alpine/Dockerfile
+++ b/libericaopenjdk-8-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM bellsoft/liberica-openjdk-alpine:8
 
-RUN apk add --no-cache bash procps curl tar
+RUN apk add --no-cache bash procps curl tar openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/libericaopenjdk-8-debian/Dockerfile b/libericaopenjdk-8-debian/Dockerfile
index 82d814ea..075606a9 100644
--- a/libericaopenjdk-8-debian/Dockerfile
+++ b/libericaopenjdk-8-debian/Dockerfile
@@ -1,7 +1,7 @@
 FROM bellsoft/liberica-openjdk-debian:8
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+  && apt-get install -y openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/microsoft-openjdk-11-ubuntu/Dockerfile b/microsoft-openjdk-11-ubuntu/Dockerfile
index 4d4de245..5d145639 100644
--- a/microsoft-openjdk-11-ubuntu/Dockerfile
+++ b/microsoft-openjdk-11-ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/openjdk/jdk:11-ubuntu
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/microsoft-openjdk-17-ubuntu/Dockerfile b/microsoft-openjdk-17-ubuntu/Dockerfile
index 96d9811f..f8d1d22d 100644
--- a/microsoft-openjdk-17-ubuntu/Dockerfile
+++ b/microsoft-openjdk-17-ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/openjdk/jdk:17-ubuntu
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/microsoft-openjdk-21-ubuntu/Dockerfile b/microsoft-openjdk-21-ubuntu/Dockerfile
index aa90c619..24e7fc4b 100644
--- a/microsoft-openjdk-21-ubuntu/Dockerfile
+++ b/microsoft-openjdk-21-ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/openjdk/jdk:21-ubuntu
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/oracle-graalvm-17/Dockerfile b/oracle-graalvm-17/Dockerfile
index e669c9b6..e09ec55a 100644
--- a/oracle-graalvm-17/Dockerfile
+++ b/oracle-graalvm-17/Dockerfile
@@ -1,6 +1,6 @@
 FROM container-registry.oracle.com/graalvm/native-image:17
 
-RUN microdnf --refresh -y install findutils
+RUN microdnf --refresh -y install findutils openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/oracle-graalvm-21/Dockerfile b/oracle-graalvm-21/Dockerfile
index 1a40e1fd..7422c6a6 100644
--- a/oracle-graalvm-21/Dockerfile
+++ b/oracle-graalvm-21/Dockerfile
@@ -1,6 +1,6 @@
 FROM container-registry.oracle.com/graalvm/native-image:21
 
-RUN microdnf --refresh -y install findutils
+RUN microdnf --refresh -y install findutils openssh-clients
 
 # common for all images
 LABEL org.opencontainers.image.title "Apache Maven"
diff --git a/sapmachine-11/Dockerfile b/sapmachine-11/Dockerfile
index 8546d94c..27e09e17 100644
--- a/sapmachine-11/Dockerfile
+++ b/sapmachine-11/Dockerfile
@@ -1,7 +1,7 @@
 FROM sapmachine:11
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/sapmachine-17/Dockerfile b/sapmachine-17/Dockerfile
index d2d39c2b..25cb39c5 100644
--- a/sapmachine-17/Dockerfile
+++ b/sapmachine-17/Dockerfile
@@ -1,7 +1,7 @@
 FROM sapmachine:17
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/sapmachine-21/Dockerfile b/sapmachine-21/Dockerfile
index 1a7addcf..d9affb21 100644
--- a/sapmachine-21/Dockerfile
+++ b/sapmachine-21/Dockerfile
@@ -1,7 +1,7 @@
 FROM sapmachine:21
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/sapmachine-22/Dockerfile b/sapmachine-22/Dockerfile
index e4a815b3..9f299331 100644
--- a/sapmachine-22/Dockerfile
+++ b/sapmachine-22/Dockerfile
@@ -1,7 +1,7 @@
 FROM sapmachine:22
 
 RUN apt-get update \
-  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # common for all images
diff --git a/tests/tests.bats b/tests/tests.bats
index e547d598..341e6369 100644
--- a/tests/tests.bats
+++ b/tests/tests.bats
@@ -162,5 +162,5 @@ base_image=eclipse-temurin-11
 
 @test "$SUT_TAG ssh is installed" {
 	run docker run --rm $SUT_IMAGE:$SUT_TAG ssh -V
-	assert_failure
+	assert_success
 }