diff --git a/adapter-dummy/Dockerfile b/adapter-dummy/Dockerfile
index 6492942..ab0bb9c 100644
--- a/adapter-dummy/Dockerfile
+++ b/adapter-dummy/Dockerfile
@@ -1,4 +1,5 @@
-FROM openjdk:8
+# https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/
+FROM adoptopenjdk/openjdk8-openj9:latest
 RUN mkdir /opt/app
 COPY build/libs/adapter-dummy-0.0.1-SNAPSHOT.jar /opt/app/app.jar
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/opt/app/app.jar"]
diff --git a/hub/Dockerfile b/hub/Dockerfile
index 0c3d330..a2082a0 100644
--- a/hub/Dockerfile
+++ b/hub/Dockerfile
@@ -1,4 +1,5 @@
-FROM openjdk:8
+# https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/
+FROM adoptopenjdk/openjdk8-openj9:latest
 RUN mkdir /opt/app
 COPY build/libs/hub-0.0.1-SNAPSHOT.jar /opt/app/app.jar
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/opt/app/app.jar"]