diff --git a/admin/Dockerfile b/admin/Dockerfile
index 777c888f8..6778cd487 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -19,7 +19,7 @@
 
 ARG DOCKER_BASE_IMAGE_PREFIX
 
-FROM "$DOCKER_BASE_IMAGE_PREFIX"adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine-slim
+FROM "$DOCKER_BASE_IMAGE_PREFIX"adoptopenjdk:11-jre
 
 ARG PROJECT_BUILD_FINAL_NAME
 ARG IMAGE_NAME
diff --git a/kafka-gateway/Dockerfile b/kafka-gateway/Dockerfile
index 3b6c25daa..afdd80fb5 100644
--- a/kafka-gateway/Dockerfile
+++ b/kafka-gateway/Dockerfile
@@ -16,7 +16,7 @@
 
 ARG DOCKER_BASE_IMAGE_PREFIX=
 
-FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9.0.45-jdk11-corretto
+FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9-jre11-openjdk-slim-buster
 
 LABEL \
     vendor="ABSA" \
diff --git a/rest-gateway/Dockerfile b/rest-gateway/Dockerfile
index 4cbfe9f67..070b8243b 100644
--- a/rest-gateway/Dockerfile
+++ b/rest-gateway/Dockerfile
@@ -16,7 +16,7 @@
 
 ARG DOCKER_BASE_IMAGE_PREFIX=
 
-FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9.0.45-jdk11-corretto
+FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9-jre11-openjdk-slim-buster
 
 LABEL \
     vendor="ABSA" \