diff --git a/Dockerfile b/Dockerfile
index 219e042..b0742fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk17:latest AS base-builder
+FROM eclipse-temurin:21 AS base-builder
 ARG SBT_VERSION=1.7.1
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
 ENV PATH=$PATH:${JAVA_HOME}/bin
diff --git a/Runner.Dockerfile b/Runner.Dockerfile
index 4b9a8eb..a6fc886 100644
--- a/Runner.Dockerfile
+++ b/Runner.Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk17:latest  AS base-core
+FROM eclipse-temurin:21  AS base-core
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
 RUN apt update && apt install -y ttf-dejavu
 ENV PATH=$PATH:${JAVA_HOME}/bin