diff --git a/9.3/jdk21/Dockerfile b/9.3/jdk21/Dockerfile
index 807e8dc..9ffc302 100644
--- a/9.3/jdk21/Dockerfile
+++ b/9.3/jdk21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-focal
+FROM eclipse-temurin:21-jdk-jammy
 
 RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.3/jre21/Dockerfile b/9.3/jre21/Dockerfile
index daeb578..d87733b 100644
--- a/9.3/jre21/Dockerfile
+++ b/9.3/jre21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre-focal
+FROM eclipse-temurin:21-jre-jammy
 
 RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.4/jdk21/Dockerfile b/9.4/jdk21/Dockerfile
index fb65fc4..cef8130 100644
--- a/9.4/jdk21/Dockerfile
+++ b/9.4/jdk21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-focal
+FROM eclipse-temurin:21-jdk-jammy
 
 RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.4/jre21/Dockerfile b/9.4/jre21/Dockerfile
index a263b3e..321821e 100644
--- a/9.4/jre21/Dockerfile
+++ b/9.4/jre21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre-focal
+FROM eclipse-temurin:21-jre-jammy
 
 RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*