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 d57fbca21..d8975741a 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
@@ -203,6 +203,10 @@ module.exports = class extends Generator {
         this.templatePath('keystores/solr'),
         this.destinationPath('keystores/solr')
       )
+      this.fs.copy(
+        this.templatePath('keystores/client'),
+        this.destinationPath('keystores/client')
+      )
       if (this.props.zeppelin == true) {
         this.fs.copy(
           this.templatePath('keystores/zeppelin'),
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore
index 22d2b69a4..76e5a1a14 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore-passwords.properties
index cbdb6fb66..3114d3806 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore-passwords.properties
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore-passwords.properties
@@ -1,7 +1,5 @@
 aliases=metadata
-# The password protecting the keystore entries
-keystore.password=mp6yc0UD9e
-# The password protecting the alias: metadata
+keystore.password=password
 metadata.keyData=
 metadata.algorithm=DESede
-metadata.password=oKIWzVdEdA
\ No newline at end of file
+metadata.password=password
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-keystore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-keystore-passwords.properties
index 3a32c534d..d6fc18bb0 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-keystore-passwords.properties
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-keystore-passwords.properties
@@ -1,7 +1,4 @@
 aliases=ssl.alfresco.ca,ssl.repo
-# The ssl keystore password
 keystore.password=kT9X6oe68t
-# The password protecting the ssl repository key
 ssl.repo.password=kT9X6oe68t
-# The password protecting the ssl Alfresco CA key
-ssl.alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
+ssl.alfresco.ca.password=kT9X6oe68t
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-truststore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-truststore-passwords.properties
index e5510fb03..e22a30988 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-truststore-passwords.properties
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-truststore-passwords.properties
@@ -1,5 +1,4 @@
-aliases=alfresco.ca
-# The ssl truststore password
+aliases=alfresco.ca,ssl.repo.client
 keystore.password=kT9X6oe68t
-# The password protecting the ssl Alfresco CA strust certificate
-alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
+alfresco.ca.password=kT9X6oe68t
+ssl.repo.client=kT9X6oe68t
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.keystore
index 3491f92e3..eed7a5d9a 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.keystore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.keystore differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.truststore
index 67273aff4..1fae1e912 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.truststore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.truststore differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/client/browser.p12 b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/client/browser.p12
new file mode 100644
index 000000000..02393e614
Binary files /dev/null and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/client/browser.p12 differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-keystore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-keystore-passwords.properties
index 161fc36dc..ebfb09d6b 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-keystore-passwords.properties
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-keystore-passwords.properties
@@ -1,7 +1,4 @@
 aliases=ssl.alfresco.ca,ssl.repo.client
-# The ssl keystore password
 keystore.password=kT9X6oe68t
-# The password protecting the ssl repository key
 ssl.repo.client.password=kT9X6oe68t
-# The password protecting the ssl Alfresco CA key
-ssl.alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
+ssl.alfresco.ca.password=kT9X6oe68t
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-truststore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-truststore-passwords.properties
index e5510fb03..08bb861dd 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-truststore-passwords.properties
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-truststore-passwords.properties
@@ -1,5 +1,5 @@
-aliases=alfresco.ca
-# The ssl truststore password
+aliases=alfresco.ca,ssl.repo,ssl.repo.client
 keystore.password=kT9X6oe68t
-# The password protecting the ssl Alfresco CA strust certificate
-alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
+alfresco.ca.password=kT9X6oe68t
+ssl.repo.password=kT9X6oe68t
+ssl.repo.client.password=kT9X6oe68t
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.keystore
index a2faa8cc8..23695c50b 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.keystore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.keystore differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.truststore
index 8b438d58c..663fceb34 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.truststore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.truststore differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.keystore
index a2faa8cc8..23695c50b 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.keystore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.keystore differ
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.truststore
index 8b438d58c..663fceb34 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.truststore and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.truststore differ