diff --git a/Jenkinsfile b/Jenkinsfile
index b83b55c31..f8ca4ffe0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,26 +33,7 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish OpenJDK 11 + Redis 6.2 docker image') {
-					when {
-						anyOf {
-							changeset "ci/openjdk11-redis-6.2/**"
-							changeset "Makefile"
-						}
-					}
-					agent { label 'data' }
-					options { timeout(time: 20, unit: 'MINUTES') }
-
-					steps {
-						script {
-							def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2", "-f ci/openjdk11-redis-6.2/Dockerfile .")
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								image.push()
-							}
-						}
-					}
-				}
-				stage('Publish OpenJDK 16 + Redis 6.2 docker image') {
+				stage('Publish OpenJDK 17 + Redis 6.2 docker image') {
 					when {
 						anyOf {
 							changeset "ci/openjdk16-redis-6.2/**"
@@ -64,7 +45,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-openjdk16-with-redis-6.2", "-f ci/openjdk16-redis-6.2/Dockerfile .")
+							def image = docker.build("springci/spring-data-openjdk17-with-redis-6.2", "-f ci/openjdk17-redis-6.2/Dockerfile .")
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 								image.push()
 							}
@@ -76,8 +57,9 @@ pipeline {
 
 		stage("test: baseline (jdk8)") {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -101,13 +83,14 @@ pipeline {
 
 		stage("Test other configurations") {
 			when {
+				beforeAgent(true)
 				allOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			parallel {
-				stage("test: baseline (jdk11)") {
+				stage("test: baseline (jdk17)") {
 					agent {
 						label 'data'
 					}
@@ -118,25 +101,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('springci/spring-data-openjdk11-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
-									sh 'PROFILE=java11 ci/test.sh'
-								}
-							}
-						}
-					}
-				}
-				stage("test: baseline (jdk16)") {
-					agent {
-						label 'data'
-					}
-					options { timeout(time: 30, unit: 'MINUTES') }
-					environment {
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-					}
-					steps {
-						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('springci/spring-data-openjdk16-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('springci/spring-data-openjdk17-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
 									sh 'PROFILE=java11 ci/test.sh'
 								}
 							}
@@ -148,8 +113,9 @@ pipeline {
 
 		stage('Release to artifactory') {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -179,35 +145,6 @@ pipeline {
 				}
 			}
 		}
-
-		stage('Publish documentation') {
-			when {
-				branch 'main'
-			}
-			agent {
-				label 'data'
-			}
-			options { timeout(time: 20, unit: 'MINUTES') }
-
-			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-			}
-
-			steps {
-				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.distribution-repository=temp-private-local " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
-					}
-				}
-			}
-		}
 	}
 
 	post {
diff --git a/ci/openjdk16-redis-6.2/Dockerfile b/ci/openjdk16-redis-6.2/Dockerfile
deleted file mode 100644
index 9f52fe183..000000000
--- a/ci/openjdk16-redis-6.2/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM adoptopenjdk/openjdk16:latest
-
-# Copy Spring Data Redis's Makefile into the container
-COPY ./Makefile /
-
-RUN set -eux; \
-	apt-get update ; \
-	apt-get install -y build-essential ; \
-	make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.4; \
-	chmod -R o+rw work; \
-	apt-get clean; \
-	rm -rf /var/lib/apt/lists/*;
diff --git a/ci/openjdk11-redis-6.2/Dockerfile b/ci/openjdk17-redis-6.2/Dockerfile
similarity index 79%
rename from ci/openjdk11-redis-6.2/Dockerfile
rename to ci/openjdk17-redis-6.2/Dockerfile
index 0508163f1..ded1bd1a1 100644
--- a/ci/openjdk11-redis-6.2/Dockerfile
+++ b/ci/openjdk17-redis-6.2/Dockerfile
@@ -1,9 +1,10 @@
-FROM adoptopenjdk/openjdk11:latest
+FROM openjdk:17-bullseye
 
 # Copy Spring Data Redis's Makefile into the container
 COPY ./Makefile /
 
 RUN set -eux; \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
 	apt-get update ; \
 	apt-get install -y build-essential ; \
 	make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.4; \