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 76e5a1a14..546590233 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 3114d3806..3c45acf29 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,5 +1,7 @@
 aliases=metadata
-keystore.password=password
+# The password protecting the keystore entries
+keystore.password=mp6yc0UD9e
+# The password protecting the alias: metadata
 metadata.keyData=
 metadata.algorithm=DESede
-metadata.password=password
+metadata.password=oKIWzVdEdA
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 d6fc18bb0..0a7fb3677 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,4 +1,7 @@
 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
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 e22a30988..c04a6b10a 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,4 +1,6 @@
 aliases=alfresco.ca,ssl.repo.client
+# The ssl truststore password
 keystore.password=kT9X6oe68t
+# The password protecting the ssl Alfresco CA strust certificate
 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 eed7a5d9a..c75a81da7 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 1fae1e912..2d1ac148a 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
index 02393e614..a58b6a736 100644
Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/client/browser.p12 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 ebfb09d6b..c9cb4d0d2 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,4 +1,7 @@
 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
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 08bb861dd..b3b70ab01 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,7 @@
 aliases=alfresco.ca,ssl.repo,ssl.repo.client
+# The ssl truststore password
 keystore.password=kT9X6oe68t
+# The password protecting the ssl Alfresco CA strust certificate
 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 23695c50b..b0dc4ef08 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 663fceb34..2feb2d827 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 23695c50b..b0dc4ef08 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 663fceb34..2feb2d827 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