diff --git a/webgoat-server/Dockerfile b/webgoat-server/Dockerfile
index c5b43c961..74d0cd4ae 100644
--- a/webgoat-server/Dockerfile
+++ b/webgoat-server/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:8-jre-slim
+FROM openjdk:11.0.1-jre-slim-stretch
 
-ARG webgoat_version=v8.0.0.SNAPSHOT
+ARG webgoat_version=v8.0.0-SNAPSHOT
 
 RUN \
   apt-get update && apt-get install && \
diff --git a/webwolf/Dockerfile b/webwolf/Dockerfile
index 2cdb1e708..a91bcbbce 100644
--- a/webwolf/Dockerfile
+++ b/webwolf/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:8-jre-slim
+FROM openjdk:11.0.1-jre-slim-stretch
 
-ARG webwolf_version=v8.0.0.SNAPSHOT
+ARG webwolf_version=v8.0.0-SNAPSHOT
 
 RUN \
   apt-get update && apt-get install && \