diff --git a/webgoat-server/pom.xml b/webgoat-server/pom.xml
index 725a08dbf..78d55dff2 100644
--- a/webgoat-server/pom.xml
+++ b/webgoat-server/pom.xml
@@ -34,7 +34,7 @@
                                 <resource>
                                     <targetPath>/</targetPath>
                                     <directory>${project.build.directory}</directory>
-                                    <include>${project.build.finalName}.war</include>
+                                    <include>${project.build.finalName}.jar</include>
                                 </resource>
                             </resources>
                         </configuration>
@@ -62,7 +62,7 @@
                                 <resource>
                                     <targetPath>/</targetPath>
                                     <directory>${project.build.directory}</directory>
-                                    <include>${project.build.finalName}.war</include>
+                                    <include>${project.build.finalName}.jar</include>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/webgoat-server/src/main/docker/Dockerfile b/webgoat-server/src/main/docker/Dockerfile
index 6d7bf526b..255e71064 100644
--- a/webgoat-server/src/main/docker/Dockerfile
+++ b/webgoat-server/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-jre
 VOLUME /tmp
 RUN cd /root; mkdir -p .webgoat
-ADD webgoat-container-8.0-SNAPSHOT.war webgoat.jar
+ADD webgoat-server-8.0-SNAPSHOT.jar webgoat.jar
 RUN sh -c 'touch /webgoat.jar'
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/webgoat.jar"]
\ No newline at end of file
diff --git a/webgoat-server/src/main/docker_rpi3/Dockerfile b/webgoat-server/src/main/docker_rpi3/Dockerfile
index 140a745ad..c72b6e4f9 100644
--- a/webgoat-server/src/main/docker_rpi3/Dockerfile
+++ b/webgoat-server/src/main/docker_rpi3/Dockerfile
@@ -5,6 +5,6 @@ VOLUME /tmp
 RUN apt-get update && apt-get install -y \
       openjdk-8-jre-headless
 RUN cd /root; mkdir -p .webgoat
-ADD webgoat-container-8.0-SNAPSHOT.war webgoat.jar
+ADD webgoat-server-8.0-SNAPSHOT.jar webgoat.jar
 RUN sh -c 'touch /webgoat.jar'
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/webgoat.jar"]
\ No newline at end of file