diff --git a/Jenkinsfile b/Jenkinsfile
index cfeac9a712..aa4208ce82 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,10 +40,10 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 20 + Redis 6.2 Docker Image') {
+				stage('Publish JDK 21 + Redis 6.2 Docker Image') {
 					when {
 						anyOf {
-							changeset "ci/openjdk20-redis-6.2/Dockerfile"
+							changeset "ci/openjdk21-redis-6.2/Dockerfile"
 							changeset "Makefile"
 							changeset "ci/pipeline.properties"
 						}
diff --git a/ci/openjdk20-redis-6.2/Dockerfile b/ci/openjdk21-redis-6.2/Dockerfile
similarity index 100%
rename from ci/openjdk20-redis-6.2/Dockerfile
rename to ci/openjdk21-redis-6.2/Dockerfile
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 5cc754eb67..8a33425f94 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,10 +1,11 @@
 # Java versions
 java.main.tag=17.0.7_7-jdk-focal
-java.next.tag=20-jdk-jammy
+java.next.tag=21-jdk-bullseye
 
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/openjdk:${java.next.tag}
+
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.22
 docker.mongodb.5.0.version=5.0.18