diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7013173009..2dc05e82b8 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -138,6 +138,13 @@
                                     <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
                                     <destFileName>ROOT.war</destFileName>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco.aos-module</groupId>
+                                    <artifactId>alfresco-vti-bin</artifactId>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
+                                    <destFileName>wti-bin.war</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
diff --git a/docker-alfresco/Dockerfile b/docker-alfresco/Dockerfile
index 8e0cb6f5e4..ae7db419b4 100644
--- a/docker-alfresco/Dockerfile
+++ b/docker-alfresco/Dockerfile
@@ -60,6 +60,7 @@ COPY target/connector/* /usr/local/tomcat/lib/
 COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/
 RUN rm -rf /usr/local/tomcat/webapps/ROOT
 COPY target/server-root/* /usr/local/tomcat/webapps
+COPY target/wti-bin/* /usr/local/tomcat/webapps
 
 # Change the value of the shared.loader= property to the following:
 # shared.loader=${catalina.base}/shared/classes
@@ -103,6 +104,9 @@ RUN mkdir /usr/local/tomcat/webapps/ROOT && cd /usr/local/tomcat/webapps/ROOT &&
 # Grant only deployXmlPermission to ROOT webapp.
     sed -i -e "\$a\grant\ codeBase\ \"file:\$\{catalina.base\}\/webapps\/alfresco\/-\" \{\n\    permission\ java.security.AllPermission\;\n\};\ngrant\ codeBase\ \"file:\$\{catalina.base\}\/webapps\/ROOT\/-\" \{\n\    permission org.apache.catalina.security.DeployXmlPermission \"ROOT\";\n\};" /usr/local/tomcat/conf/catalina.policy
 
+# Unpack wti-bin.war
+RUN mkdir /usr/local/tomcat/webapps/wti-bin && cd /usr/local/tomcat/webapps/wti-bin && jar -xvf /usr/local/tomcat/webapps/wti-bin.war && rm -f /usr/local/tomcat/webapps/wti-bin.war
+
 # To remote debug into this image add: EXPOSE 8000
 # Changes are also required to the docker-compose/docker-compose.yml file.
 # EXPOSE 8000
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index f53f244606..4940bda9b9 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -139,6 +139,15 @@
                                     <outputDirectory>${project.build.directory}/server-root</outputDirectory>
                                     <destFileName>ROOT.war</destFileName>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco.aos-module</groupId>
+                                    <artifactId>alfresco-vti-bin</artifactId>
+                                    <version>${alfresco.aos-module.version}</version>
+                                    <type>war</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/wti-bin</outputDirectory>
+                                    <destFileName>wti-bin.war</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>