diff --git a/ci/Dockerfile b/ci/Dockerfile
index dcca3565..775ba1a6 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.13_10-jdk-jammmy
+FROM eclipse-temurin:17-jdk-jammmy
 
 RUN apt-get update && apt-get install -y gpg
 
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 09915555..09e8a002 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,7 +1,7 @@
 # Java versions
-java.legacy.tag=8u362-b09-jdk-focal
-java.main.tag=17.0.6_10-jdk-focal
-java.next.tag=20-jdk-jammy
+java.legacy.tag=8-jdk-jammy
+java.main.tag=17-jdk-jammy
+java.next.tag=21-jdk-jammy
 
 # Docker container images - standard
 docker.java.legacy.image=library/eclipse-temurin:${java.legacy.tag}