diff --git a/Dockerfile b/Dockerfile
index cb80dcf7..fc1eefc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat
+FROM tomcat:8.5.55-jdk8-openjdk
 
 COPY . .
 
-RUN apt-get update ; apt-get install maven default-jdk -y ; update-alternatives --config javac
+RUN apt-get update apt-get install maven -y
 
 RUN mvn clean package ; cp target/*.war /usr/local/tomcat/webapps/
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 672bcaca..69888a38 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,6 @@ javavulnlab:
     - mysql
 
 mysql:
-  image: mysql
+  image: mysql:5.7
   environment:
     - MYSQL_ROOT_PASSWORD=root