diff --git a/docker/Dockerfile b/docker/Dockerfile
index e54e111a98..75304eb8f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /usr/local/tomcat/shared/classes
 
 RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties
 
-COPY target/war/alfresco.war /usr/local/tomcat/webapps/alfresco.war
+COPY target/war /usr/local/tomcat/webapps
 COPY target/connector/* /usr/local/tomcat/lib/
 
 RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties
diff --git a/docker/pom.xml b/docker/pom.xml
index 7bf7f9df4e..d0cead9e69 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -41,7 +41,7 @@
                         <id>copy-resources</id>
                         <phase>process-resources</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>unpack</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -53,7 +53,7 @@
                             <version>${project.version}</version>
                             <type>war</type>
                             <overWrite>false</overWrite>
-                            <outputDirectory>${project.build.directory}/war</outputDirectory>
+                            <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
                             <destFileName>alfresco.war</destFileName>
                         </artifactItem>
                         <artifactItem>