diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index 816153be..bde03382 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -2,9 +2,8 @@
 
 # We start by defining an ARG for the Jenkins version. This allows us to easily change the version of Jenkins we want to use.
 ARG JENKINS_VERSION=2.492.3
-
 # We then use the official Jenkins image with the specified version as our base image.
-FROM jenkins/jenkins:"${JENKINS_VERSION}"
+FROM jenkins/jenkins:"${JENKINS_VERSION}"-lts-jdk21
 
 # We switch to the root user to have the necessary permissions for the upcoming operations.
 USER root
diff --git a/dockerfiles/android/Dockerfile b/dockerfiles/android/Dockerfile
index 4c73b730..62411242 100644
--- a/dockerfiles/android/Dockerfile
+++ b/dockerfiles/android/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 
 # ca-certificates because curl uses certificates from ca-certificates
 RUN apt-get update && apt-get install -y --no-install-recommends adb build-essential ca-certificates curl file git python3 python3-pip unzip
diff --git a/dockerfiles/cpp/Dockerfile b/dockerfiles/cpp/Dockerfile
index 47ad80ca..4df3630d 100644
--- a/dockerfiles/cpp/Dockerfile
+++ b/dockerfiles/cpp/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0
+FROM jenkins/ssh-agent:6.12.0-jdk21
 
 # Install necessary C++ build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/dockerfiles/dotnet/Dockerfile b/dockerfiles/dotnet/Dockerfile
index 7c46c6c3..55a5d303 100644
--- a/dockerfiles/dotnet/Dockerfile
+++ b/dockerfiles/dotnet/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 AS ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 AS ssh-agent
 
 # install dotnet dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends libc6 libgcc1 libgssapi-krb5-2 libicu72 libssl3 libstdc++6 zlib1g wget && apt-get clean && \
diff --git a/dockerfiles/golang/Dockerfile b/dockerfiles/golang/Dockerfile
index 4accc196..01899258 100644
--- a/dockerfiles/golang/Dockerfile
+++ b/dockerfiles/golang/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 
 # ca-certificates because curl uses certificates from ca-certificates
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \
diff --git a/dockerfiles/maven/Dockerfile b/dockerfiles/maven/Dockerfile
index 4850c684..b8cb48c7 100644
--- a/dockerfiles/maven/Dockerfile
+++ b/dockerfiles/maven/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 
 # ca-certificates because curl uses certificates from ca-certificates
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \
diff --git a/dockerfiles/multi/Dockerfile b/dockerfiles/multi/Dockerfile
index 2e1669ce..847acdf5 100644
--- a/dockerfiles/multi/Dockerfile
+++ b/dockerfiles/multi/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 
 ARG NODE_MAJOR=20
 
diff --git a/dockerfiles/node/Dockerfile b/dockerfiles/node/Dockerfile
index 34eec4ae..2c3830f2 100644
--- a/dockerfiles/node/Dockerfile
+++ b/dockerfiles/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 ARG NODE_MAJOR=22
 
 # ca-certificates because curl uses certificates from ca-certificates
diff --git a/dockerfiles/python/Dockerfile b/dockerfiles/python/Dockerfile
index 91405fae..66dbeff6 100644
--- a/dockerfiles/python/Dockerfile
+++ b/dockerfiles/python/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile is used to create a Jenkins SSH agent with Python and several Python packages installed in order to run the python sample tutorial.
 
 # We start from the Jenkins SSH agent image version 5.20.0.
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 
 # The RUN command executes a series of commands in the new layer of the image and commits the results.
 # The following commands are executed: