diff --git a/Dockerfile b/Dockerfile
index b4f1430..52e4190 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ COPY . /app
 RUN mvn compile war:war
 
 # Tomcat 10 needs further changes, see https://tomcat.apache.org/migration-10.html
-FROM tomcat:9
+FROM tomcat:9-jdk11
 LABEL maintainer=adrian.gschwend@zazuko.com
 ENV CATALINA_OPTS="-XX:+UseSerialGC"
 COPY --from=builder /app/target/lodview.war /usr/local/tomcat/webapps/lodview.war
diff --git a/pom.xml b/pom.xml
index 2eefed4..7605535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,11 @@
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.5.1</version>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>