diff --git a/Jenkinsfile b/Jenkinsfile
index f20754d..1b0ca19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
 
 			steps {
 				script {
-					def image = docker.build("springci/spring-data-release-tools:0.20", "ci")
+					def image = docker.build("springci/spring-data-release-tools:0.22", "ci")
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 						image.push()
 					}
@@ -64,7 +64,7 @@ pipeline {
 
 			steps {
 				script {
-					docker.image("springci/spring-data-release-tools:0.20").inside() {
+					docker.image("springci/spring-data-release-tools:0.22").inside() {
 						sh "ci/build-spring-data-release-cli.bash"
 						sh "ci/build-and-distribute.bash ${p['release.version']}"
 					}
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 4327151..cae6d92 100755
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:23.04
+FROM ubuntu:25.04
 
 # Bake a container using sdkman to get all the needed JDKs.
 ARG USER_UID="1100"
@@ -32,9 +32,9 @@ RUN curl -s "https://get.sdkman.io" | bash
 RUN bash -c "cd /home/jenkins && \
 	chmod a+x /home/jenkins/java-init.sh && \
 	./java-init.sh && \
-	rm -rf $HOME/.sdkman/archives/* && \
-	rm -rf $HOME/.sdkman/tmp/*"
+	rm -rf /home/jenkins/.sdkman/archives/* && \
+	rm -rf /home/jenkins/.sdkman/tmp/*"
 
-ENV MAVEN_HOME="$HOME/.sdkman/candidates/maven/current"
-ENV JAVA_HOME="$HOME/.sdkman/candidates/java/current"
+ENV MAVEN_HOME="/home/jenkins/.sdkman/candidates/maven/current"
+ENV JAVA_HOME="/home/jenkins/.sdkman/candidates/java/current"
 ENV PATH="$MAVEN_HOME/bin:$JAVA_HOME/bin:$PATH"
diff --git a/ci/java-tools.properties b/ci/java-tools.properties
index b177430..6203138 100644
--- a/ci/java-tools.properties
+++ b/ci/java-tools.properties
@@ -1,3 +1,3 @@
 # Tool requirements
-jdks=17.0.13,17.0.12,17.0.9,8.0.382
+jdks=24.0.1,23.0.2,17.0.13,8.0.382
 maven=3.9.9