diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
index c8d675f5..ccebad02 100644
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@@ -27,7 +27,7 @@ RUN set -eux && \
     ARCH_SUFFIX="$(apk --print-arch)"; \
     case "$ARCH_SUFFIX" in \
         riscv64) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \
-        *)       openjdk_packages='openjdk17 openjdk17-jre-headless' ;; \
+        *)       openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \
     esac; \
     INSTALL_PKGS="bash \
             autoconf \
diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile
index 79e77acd..7adfb0ed 100644
--- a/Dockerfiles/build-base/ubuntu/Dockerfile
+++ b/Dockerfiles/build-base/ubuntu/Dockerfile
@@ -49,7 +49,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
             libssh-dev \
             libxml2-dev \
             make \
-            openjdk-17-jdk-headless \
+            openjdk-21-jdk-headless \
             patch \
             pkg-config \
             gettext \
diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile
index 3eaab84b..43602ac4 100644
--- a/Dockerfiles/java-gateway/alpine/Dockerfile
+++ b/Dockerfiles/java-gateway/alpine/Dockerfile
@@ -37,7 +37,7 @@ RUN set -eux && \
     ARCH_SUFFIX="$(apk --print-arch)"; \
     case "$ARCH_SUFFIX" in \
         riscv64) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \
-        *)       openjdk_packages='openjdk17 openjdk17-jre-headless' ;; \
+        *)       openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \
     esac; \
     INSTALL_PKGS="bash \
             $openjdk_packages" && \
diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile
index e7f8dd9c..8d3c8097 100644
--- a/Dockerfiles/java-gateway/ubuntu/Dockerfile
+++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile
@@ -38,7 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
     printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \
     chmod +x /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
-            openjdk-17-jre-headless" && \
+            openjdk-21-jre-headless" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             -o Dpkg::Options::="--force-confdef" \