diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile
index 6b43fb21..5fb756f9 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ${docker.share.image}:${alfresco.share.version}
+FROM ${docker.share.image}:${alfresco.share.docker.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
@@ -13,4 +13,4 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
 COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
 
 COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
-COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
\ No newline at end of file
+COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
index d9a6cb2c..f1ce5024 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -24,6 +24,7 @@
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
index cbb8411c..7bd84f43 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
@@ -20,6 +20,7 @@
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
index cbc3655c..25bae3a0 100644
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
@@ -20,6 +20,7 @@
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile
index 6b43fb21..5fb756f9 100644
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ${docker.share.image}:${alfresco.share.version}
+FROM ${docker.share.image}:${alfresco.share.docker.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
@@ -13,4 +13,4 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
 COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
 
 COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
-COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
\ No newline at end of file
+COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
diff --git a/pom.xml b/pom.xml
index e5a1b11e..055da2ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,11 @@
 
         <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
         <alfresco.platform.version>7.1.0-A14</alfresco.platform.version>
-        <alfresco.share.version>7.0.0.3</alfresco.share.version>
+        <alfresco.share.docker.version>7.1.0-M2</alfresco.share.docker.version>
+        <!-- The following value is obtained by looking at the Share Services version
+             for the GitHub Tag related to the above Docker version, for example:
+             https://github.com/Alfresco/acs-community-packaging/blob/7.1.0-M1/pom.xml#L19 -->
+        <alfresco.share.version>7.1.0-M2</alfresco.share.version>
         <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
         <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
         <keystore.settings>
@@ -99,6 +103,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
+                <alfresco.share.docker.version>6.0.b</alfresco.share.docker.version>
                 <alfresco.share.version>6.0.b</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
@@ -111,6 +116,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.0.0.2</alfresco.platform.version>
+                <alfresco.share.docker.version>6.0</alfresco.share.docker.version>
                 <alfresco.share.version>6.0</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
@@ -125,6 +131,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.1.2-ga</alfresco.platform.version>
+                <alfresco.share.docker.version>6.1.1</alfresco.share.docker.version>
                 <alfresco.share.version>6.1.1</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
@@ -136,6 +143,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.1.1.11</alfresco.platform.version>
+                <alfresco.share.docker.version>6.1.1.3</alfresco.share.docker.version>
                 <alfresco.share.version>6.1.1.3</alfresco.share.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
@@ -149,6 +157,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.2.0-ea</alfresco.platform.version>
+                <alfresco.share.docker.version>6.2.2.5</alfresco.share.docker.version>
                 <alfresco.share.version>6.2.2.5</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
@@ -160,6 +169,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.2.2.21</alfresco.platform.version>
+                <alfresco.share.docker.version>6.2.2.5</alfresco.share.docker.version>
                 <alfresco.share.version>6.2.2.5</alfresco.share.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
@@ -173,6 +183,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>7.0.1-A7</alfresco.platform.version>
+                <alfresco.share.docker.version>7.0.0.3</alfresco.share.docker.version>
                 <alfresco.share.version>7.0.0.3</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
@@ -183,6 +194,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>7.0.1.4</alfresco.platform.version>
+                <alfresco.share.docker.version>7.0.0.3</alfresco.share.docker.version>
                 <alfresco.share.version>7.0.0.3</alfresco.share.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
@@ -195,6 +207,7 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>7.1.0-A14</alfresco.platform.version>
+                <alfresco.share.docker.version>7.0.0.3</alfresco.share.docker.version>
                 <alfresco.share.version>7.0.0.3</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
@@ -205,7 +218,8 @@
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>7.1.0-A14</alfresco.platform.version>
-                <alfresco.share.version>7.1.0-A14</alfresco.share.version>
+                <alfresco.share.version>11.71</alfresco.share.version>
+                <alfresco.share.docker.version>7.1.0-A14</alfresco.share.docker.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
             </properties>