diff --git a/e2e-test/generator-alfresco-docker-compose/README.md b/e2e-test/generator-alfresco-docker-compose/README.md
index 82339a1fa..b02cef422 100644
--- a/e2e-test/generator-alfresco-docker-compose/README.md
+++ b/e2e-test/generator-alfresco-docker-compose/README.md
@@ -135,6 +135,7 @@ http://localhost:8083/solr
 http://localhost:9090/zeppelin
 
 SSL
+
 http://localhost:8080/share
 
 http://localhost:8080/alfresco
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 7877ea815..d5d8707dd 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
@@ -122,8 +122,12 @@ module.exports = class extends Generator {
     // Add resources for SSL configuration
     if (this.props.httpMode == 'https') {
       this.fs.copy(
-        this.templatePath('keystores'),
-        this.destinationPath('keystores')
+        this.templatePath('keystores/alfresco'),
+        this.destinationPath('keystores/alfresco')
+      )
+      this.fs.copy(
+        this.templatePath('keystores/solr'),
+        this.destinationPath('keystores/solr')
       )
       this.fs.copyTpl(
         this.templatePath(this.props.acsVersion + '/alfresco-https'),
@@ -153,6 +157,10 @@ module.exports = class extends Generator {
           this.templatePath(this.props.acsVersion + '/zeppelin-https'),
           this.destinationPath('zeppelin-https')
         )
+        this.fs.copy(
+          this.templatePath('keystores/zeppelin'),
+          this.destinationPath('keystores/zeppelin')
+        )
       }
     }
 
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
index 15e02ab6c..b5d68fd0c 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
@@ -28,7 +28,7 @@ services:
                 -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
                 -Dsolr.host=solr6
-                -Dsolr.port=8983 
+                -Dsolr.port.ssl=8983 
                 -Dsolr.secureComms=<%=secureComms%>
                 -Dsolr.base.url=/solr
                 -Dindex.subsystem.name=solr6