diff --git a/jdk-lts-and-current-alpine/Dockerfile b/jdk-lts-and-current-alpine/Dockerfile
index f4bcb66e..c089b581 100644
--- a/jdk-lts-and-current-alpine/Dockerfile
+++ b/jdk-lts-and-current-alpine/Dockerfile
@@ -3,8 +3,10 @@ FROM eclipse-temurin:22-jdk-alpine AS java_current
 FROM eclipse-temurin:21-jdk-alpine
 
 COPY --from=java_current /opt/java/openjdk /opt/java/openjdk22
-ENV JAVA_LTS_HOME /opt/java/openjdk21
+RUN set -o errexit -o nounset \
+    && ln -s /opt/java/openjdk /opt/java/openjdk21
 ENV JAVA_CURRENT_HOME /opt/java/openjdk22
+ENV JAVA_LTS_HOME /opt/java/openjdk21
 
 CMD ["gradle"]
 
diff --git a/jdk-lts-and-current/Dockerfile b/jdk-lts-and-current/Dockerfile
index e5202b9d..d2656565 100644
--- a/jdk-lts-and-current/Dockerfile
+++ b/jdk-lts-and-current/Dockerfile
@@ -3,6 +3,8 @@ FROM eclipse-temurin:22-jdk-jammy AS java_current
 FROM eclipse-temurin:21-jdk-jammy
 
 COPY --from=java_current /opt/java/openjdk /opt/java/openjdk22
+RUN set -o errexit -o nounset \
+    && ln --symbolic /opt/java/openjdk /opt/java/openjdk21
 ENV JAVA_LTS_HOME /opt/java/openjdk21
 ENV JAVA_CURRENT_HOME /opt/java/openjdk22