diff --git a/Dockerfile b/Dockerfile
index 33e878d..d81fdb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build backend
-FROM eclipse-temurin:20-jdk-jammy AS build-back
+FROM eclipse-temurin:21-jdk-jammy AS build-back
 
 WORKDIR /app
 
@@ -23,7 +23,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 RUN pnpm run build
 
 # Build final image
-FROM eclipse-temurin:20-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 RUN apt-get update && \
     apt-get install -y curl ca-certificates gnupg && \
     curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
diff --git a/backend/Dockerfile b/backend/Dockerfile
index a9419bb..bce50bb 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:20-jdk-jammy AS build
+FROM eclipse-temurin:21-jdk-jammy AS build
 
 WORKDIR /app
 
@@ -10,7 +10,7 @@ COPY src src
 
 RUN ./gradlew clean build -x test
 
-FROM eclipse-temurin:20-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 WORKDIR /app
 COPY --from=build /app/build/libs/mintstone-backend.jar app.jar
 EXPOSE 8080