diff --git a/Dockerfile b/Dockerfile
index 4ef5fa5d..baa9590f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,11 @@ COPY --chown=gradle:gradle ./log4j-cve-2021-44228 /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle :malicious-server:bootJar --no-daemon
 
+FROM maven:3.8.6-openjdk-8 as maven
+COPY . /home/app
+WORKDIR /home/app
+RUN mvn clean package
+
 FROM openjdk:8u181-jdk-alpine
 
 RUN mkdir /app
@@ -13,20 +18,20 @@ COPY --from=builder /home/gradle/src/malicious-server/build/libs/*.jar /app/mali
 RUN mkdir -p /usr/local/tomcat/
 
 WORKDIR /usr/local/tomcat
-RUN wget --no-check-certificate http://dlcdn.apache.org/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.tar.gz
+RUN wget --no-check-certificate https://apache.root.lu/tomcat/tomcat-8/v8.5.93/bin/apache-tomcat-8.5.93.tar.gz
 RUN tar xvfz apache*.tar.gz
-RUN mv apache-tomcat-8.5.73/* /usr/local/tomcat/.
+RUN mv apache-tomcat-8.5.93/* /usr/local/tomcat/.
 
 ADD start.sh /usr/local/tomcat/
 
 # Copy the application to tomcat
-ADD target/insecure-bank.war /usr/local/tomcat/webapps
+COPY --from=maven /home/app/target/insecure-bank.war /usr/local/tomcat/webapps/insecure-bank.war
 
-# Copy the license file
-ADD license.hdiv /usr/local/tomcat/hdiv/
+# # Copy the license file
+# ADD license.hdiv /usr/local/tomcat/hdiv/
 
-# Copy the agent jar
-ADD hdiv-ee-agent.jar /usr/local/tomcat/hdiv/
+# # Copy the agent jar
+# ADD hdiv-ee-agent.jar /usr/local/tomcat/hdiv/
 
 # Run Tomcat and enjoy!
 CMD export JAVA_OPTS="-javaagent:hdiv/hdiv-ee-agent.jar \