diff --git a/nowait-app-admin-api/Dockerfile b/nowait-app-admin-api/Dockerfile
index 6ace55d1..457d3fd7 100644
--- a/nowait-app-admin-api/Dockerfile
+++ b/nowait-app-admin-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-slim
+FROM openjdk:21-slim
 ARG JAR_FILE=./build/libs/*.jar
 COPY ${JAR_FILE} nowait-app-admin-api.jar
 
diff --git a/nowait-app-user-api/Dockerfile b/nowait-app-user-api/Dockerfile
index 2cd8677f..0c122c2f 100644
--- a/nowait-app-user-api/Dockerfile
+++ b/nowait-app-user-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-slim
+FROM openjdk:21-slim
 ARG JAR_FILE=./build/libs/*.jar
 COPY ${JAR_FILE} nowait-app-user-api.jar
 
diff --git a/nowait-common/Dockerfile b/nowait-common/Dockerfile
index 62b4fcea..ce3e2380 100644
--- a/nowait-common/Dockerfile
+++ b/nowait-common/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-slim
+FROM openjdk:21-slim
 
 WORKDIR /app
 COPY build/libs/*.jar nowait-common.jar