diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
index e13b02ccb..ed68516d1 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
@@ -22,7 +22,7 @@ module.exports = class extends Generator {
         name: 'acsVersion',
         message: 'Which ACS version do you want to use?',
         choices: [ '6.1', '6.2', '7.0' ],
-        default: 'latest'
+        default: '7.0'
       },
       {
         whenFunction: response => response.acsVersion == '6.1',
@@ -220,7 +220,7 @@ module.exports = class extends Generator {
         httpWebMode: this.props.httpWebMode,
         port: (this.props.httpWebMode == 'http' ? '8080' : '443'),
         secureComms: (this.props.httpMode == 'http' ? 'none' : this.props.httpMode),
-        alfrescoPort: (this.props.httpMode == 'http' ? '8080' : '8443'),
+        alfrescoPort: (this.props.httpMode == 'https' ? '8443' : '8080'),
         replication: this.props.replication,
         searchSolrHost: (this.props.replication ? "solr6secondary" : "solr6"),
         searchPath: searchBasePath,
@@ -279,7 +279,7 @@ module.exports = class extends Generator {
       )
     }
 
-    // Empty addons directories.
+    // Empty addons directories
     ['alfresco', 'share'].forEach(container => {
       ['jars', 'amps'].forEach(addonType => {
         this.fs.copy(
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ce.yml
index 77b939b5d..0ac1a9f74 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ce.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ce.yml
@@ -14,6 +14,7 @@ services:
             KEYSTORE_TYPE: JCEKS
             KEYSTORE_PASS: kT9X6oe68t <% } %>
             COMPRESS_CONTENT: "<%=gzip%>"
+            SHARE_SERVICES_TAG: ${SHARE_TAG}
         mem_limit: 1800m
         depends_on:
             - postgres
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ee.yml
index d2f1137a8..1dfd6e40f 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ee.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/7.0/docker-compose-ee.yml
@@ -13,6 +13,7 @@ services:
             KEYSTORE_TYPE: JCEKS
             KEYSTORE_PASS: kT9X6oe68t <% } %>
             COMPRESS_CONTENT: "<%=gzip%>"
+            SHARE_SERVICES_TAG: ${SHARE_TAG}
         mem_limit: 1800m
         environment:
             JAVA_TOOL_OPTIONS: "
@@ -121,10 +122,6 @@ services:
             - 8083:8983 <% if (httpMode == 'https') { %>
         volumes:
             - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
-        ports:
-            - 8083:8983 <% if (httpMode == 'https') { %>
-        volumes:
-            - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
 
     <% if (sharding == 'true' || replication) { %>
     solr6secondary:
@@ -181,10 +178,6 @@ services:
             - 8083:8983 <% if (httpMode == 'https') { %>
         volumes:
             - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
-        ports:
-            - 8084:8983  <% if (httpMode == 'https') { %>
-        volumes:
-            - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
     <% } %>
 
     <% if (zeppelin == 'true') { %>
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/alfresco/Dockerfile b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/alfresco/Dockerfile
index 9478df4ff..f1ee5714a 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/alfresco/Dockerfile
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/alfresco/Dockerfile
@@ -25,6 +25,19 @@ VOLUME ["${ALF_DATA_DIR}/keystore"]
 
 USER root
 
+ARG SHARE_SERVICES_TAG
+ENV SHARE_SERVICES_TAG $SHARE_SERVICES_TAG
+
+# From Alfresco Repository 7.0.0 Share Services AMP is not provided with default Docker Image
+RUN if [ ! -z "$SHARE_SERVICES_TAG" ] ; then \
+    yum -y update && \
+    yum -y install wget && \
+    yum clean all && \
+    mkdir -p $TOMCAT_DIR/amps && \
+    wget https://nexus.alfresco.com/nexus/service/local/repo_groups/public/content/org/alfresco/alfresco-share-services/${SHARE_SERVICES_TAG}/alfresco-share-services-${SHARE_SERVICES_TAG}.amp \
+    -O $TOMCAT_DIR/amps/alfresco-share-services-${SHARE_SERVICES_TAG}.amp; \
+fi
+
 # Install modules and addons
 RUN mkdir -p $TOMCAT_DIR/amps
 COPY modules/amps/* $TOMCAT_DIR/amps/