diff --git a/Jenkinsfile b/Jenkinsfile
index 2b30297221..3233b3698d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,13 +41,13 @@ if (needSplittingFromWorkspace) {
 def axes = [
   jenkinsVersions: ['lts', 'latest'],
   platforms: ['linux'],
-  jdks: [17, 21],
+  jdks: [17, 21, 25],
   browsers: ['firefox'],
 ]
 
 stage('Record builds and sessions') {
   retry(conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()], count: 2) {
-    node('maven-21') {
+    node('maven-25') {
       infra.checkoutSCM()
       def athCommit = sh(script: 'git rev-parse HEAD', returnStdout: true).trim()
       withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
@@ -81,7 +81,7 @@ stage('Record builds and sessions') {
 branches['CI'] = {
   stage('CI') {
     retry(count: 2, conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()]) {
-      node('maven-21') {
+      node('maven-25') {
         checkout scm
         def mavenOptions = [
           '-Dset.changelist',
@@ -90,7 +90,7 @@ branches['CI'] = {
           'clean',
           'install',
         ]
-        infra.runMaven(mavenOptions, 21)
+        infra.runMaven(mavenOptions, 25)
         infra.prepareToPublishIncrementals()
       }
     }
@@ -101,10 +101,10 @@ for (int i = 0; i < splits.size(); i++) {
   int index = i
   axes.values().combinations {
     def (jenkinsVersion, platform, jdk, browser) = it
-    if (jdk == 21 && jenkinsVersion != 'latest') {
+    if (jenkinsVersion == 'latest' && !(jdk in [21, 25])) {
       return
     }
-    if (jdk != 21 && jenkinsVersion == 'latest') {
+    if (jenkinsVersion == 'lts' && jdk != 21) {
       return
     }
     def name = "${jenkinsVersion}-${platform}-jdk${jdk}-${browser}-split${index}"
diff --git a/src/main/resources/ath-container/Dockerfile b/src/main/resources/ath-container/Dockerfile
index 4ece1e46b4..296a48efb5 100644
--- a/src/main/resources/ath-container/Dockerfile
+++ b/src/main/resources/ath-container/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update \
     lsb-release \
     openjdk-17-jdk \
     openjdk-21-jdk \
+    openjdk-25-jdk \
     openssh-client \
     unzip \
     xfonts-base \
diff --git a/src/main/resources/ath-container/set-java.sh b/src/main/resources/ath-container/set-java.sh
index 41678cb48b..902362fec8 100755
--- a/src/main/resources/ath-container/set-java.sh
+++ b/src/main/resources/ath-container/set-java.sh
@@ -8,6 +8,8 @@ if [[ $1 == '17' ]]; then
 	selection='17-openjdk'
 elif [[ $1 == '21' ]]; then
 	selection='21-openjdk'
+elif [[ $1 == '25' ]]; then
+	selection='25-openjdk'
 else
 	echo >&2 "Unsupported java version '${1}'"
 	exit 1
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
index d26f46c686..489fe1e77e 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     zip \
     openjdk-17-jdk \
     openjdk-21-jdk \
+    openjdk-25-jdk \
     && rm -rf /var/lib/apt/lists/*
 
 # create a git user and create .ssh dir