diff --git a/refarch-gateway/Dockerfile b/refarch-gateway/Dockerfile
index d7540e49..fa43a00a 100644
--- a/refarch-gateway/Dockerfile
+++ b/refarch-gateway/Dockerfile
@@ -1,3 +1,3 @@
-FROM registry.access.redhat.com/ubi9/openjdk-21:latest
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-service/Dockerfile b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-service/Dockerfile
index d7540e49..fa43a00a 100644
--- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-service/Dockerfile
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-service/Dockerfile
@@ -1,3 +1,3 @@
-FROM registry.access.redhat.com/ubi9/openjdk-21:latest
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar