diff --git a/BUILD b/BUILD
index d5832ad6c..d56b1fb79 100644
--- a/BUILD
+++ b/BUILD
@@ -278,9 +278,9 @@ JAVA17 |= {
     for (tag_base, label) in JAVA_VARIATIONS
 }
 
-## JAVA 21 from temurin
+## JAVA 21
 JAVA21 = {
-    "{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro
+    "{REGISTRY}/{PROJECT_ID}/java21-" + distro + ":" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro
     for (tag_base, label) in JAVA_VARIATIONS
     for arch in JAVA_ARCHITECTURES
     for distro in DISTROS + PREVIEW_DISTROS
@@ -293,7 +293,7 @@ JAVA21 |= {
 }
 
 JAVA21 |= {
-    "{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base: "//java:java21_" + label + "_" + distro
+    "{REGISTRY}/{PROJECT_ID}/java21-" + distro + ":" + tag_base: "//java:java21_" + label + "_" + distro
     for (tag_base, label) in JAVA_VARIATIONS
     for distro in DISTROS + PREVIEW_DISTROS
 }
diff --git a/examples/java/Dockerfile b/examples/java/Dockerfile
index 5d0525e29..16ac76700 100644
--- a/examples/java/Dockerfile
+++ b/examples/java/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim AS build-env
+FROM eclipse-temurin:17-jdk AS build-env
 COPY . /app/examples
 WORKDIR /app
 RUN javac examples/*.java