diff --git a/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
index 6f78f6339..c1b824f93 100644
--- a/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
@@ -15,19 +15,19 @@ ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
-    ccache \
-    g++-10 \
-    gcc-10 \
-    g++-12 \
-    gcc-12 \
-    git \
-    openjdk-17-jre-headless \
-    curl \
-    python3-pip \
-    python-is-python3 \
-    libfontconfig1 \
-    libtool \
-    automake
+      ccache \
+      g++-10 \
+      gcc-10 \
+      g++-12 \
+      gcc-12 \
+      git \
+      openjdk-25-jre-headless \
+      curl \
+      python3-pip \
+      python-is-python3 \
+      libfontconfig1 \
+      libtool \
+      automake
 
 RUN pip3 install tap2junit=={{ tap2junit_version }}
 
diff --git a/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
index accc17f70..e7dd9f37a 100644
--- a/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
@@ -13,13 +13,15 @@ ENV OSVARIANT docker
 ENV DESTCPU {{ arch }}
 ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
+
+RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
+      ccache \
       g++-10 \
       gcc-10 \
       g++-12 \
       gcc-12 \
       git \
-      openjdk-17-jre-headless \
+      openjdk-25-jre-headless \
       pkg-config \
       curl \
       python3-pip \
diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
index 45a07b2fb..91aae89d2 100644
--- a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install apt-utils -y && \
       g++-12 \
       gcc-12 \
       git \
-      openjdk-17-jre-headless \
+      openjdk-25-jre-headless \
       pkg-config \
       curl \
       python3-pip \
diff --git a/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2
index 7b8f42f03..efe0ac261 100644
--- a/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2
@@ -15,21 +15,21 @@ ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
-    ccache \
-    g++ \
-    gcc \
-    clang-19 \
-    cargo-1.82 \
-    rustc-1.82 \
-    git \
-    openjdk-21-jre-headless \
-    curl \
-    python3-pip \
-    python3-venv \
-    python-is-python3 \
-    libfontconfig1 \
-    libtool \
-    automake
+      ccache \
+      g++ \
+      gcc \
+      clang-19 \
+      cargo-1.82 \
+      rustc-1.82 \
+      git \
+      openjdk-25-jre-headless \
+      curl \
+      python3-pip \
+      python3-venv \
+      python-is-python3 \
+      libfontconfig1 \
+      libtool \
+      automake
 
 RUN python3 -m venv /usr/local/venv
 RUN pip3 install tap2junit=={{ tap2junit_version }}
diff --git a/ansible/roles/docker/templates/ubuntu2404_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2404_armv7l.Dockerfile.j2
index 196800d09..9f522f242 100644
--- a/ansible/roles/docker/templates/ubuntu2404_armv7l.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2404_armv7l.Dockerfile.j2
@@ -13,12 +13,14 @@ ENV OSVARIANT docker
 ENV DESTCPU {{ arch }}
 ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
+
+RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
+      ccache \
       g++ \
       gcc \
       clang-19 \
       git \
-      openjdk-21-jre-headless \
+      openjdk-25-jre-headless \
       pkg-config \
       curl \
       python3-pip \