diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index 7e0dffe9..08be87f1 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -19,15 +19,7 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../${rootArtifactId}-platform-docker/target
     environment:
-      JAVA_TOOL_OPTIONS: "
-        -Dencryption.keystore.type=JCEKS
-        -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding
-        -Dencryption.keyAlgorithm=AES
-        -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-        -Dmetadata-keystore.password=mp6yc0UD9e
-        -Dmetadata-keystore.aliases=metadata
-        -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-        -Dmetadata-keystore.metadata.algorithm=AES"
+      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
       CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
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 19fa760f..f39ddfe0 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
@@ -29,6 +29,8 @@
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
+
         <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
         <jrebel.version>1.1.8</jrebel.version>
 
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index fd7bacc5..0178f58b 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -15,15 +15,7 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../target
     environment:
-      JAVA_TOOL_OPTIONS: "
-        -Dencryption.keystore.type=JCEKS
-        -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding
-        -Dencryption.keyAlgorithm=AES
-        -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-        -Dmetadata-keystore.password=mp6yc0UD9e
-        -Dmetadata-keystore.aliases=metadata
-        -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-        -Dmetadata-keystore.metadata.algorithm=AES"
+      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
       CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
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 f2c9fd80..08299042 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
@@ -25,6 +25,8 @@
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
+
         <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
         <jrebel.version>1.1.8</jrebel.version>
 
@@ -531,4 +533,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index 05cfbe37..8ce05daf 100644
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -32,6 +32,7 @@ services:
 #                -Dtransform.service.enabled=false
 #                -Dlocal.transform.service.enabled=false
 #                -Dlegacy.transform.service.enabled=false
+#                ${symbol_dollar}{keystore.settings}
 #                "
 #    ports:
 #      - "${symbol_dollar}{acs.port}:8080"
@@ -69,4 +70,4 @@ services:
 #  ${rootArtifactId}-db-volume:
 #    external: true
 #  ${rootArtifactId}-ass-volume:
-#    external: true
\ No newline at end of file
+#    external: true
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 9054f355..cbc3655c 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
@@ -25,6 +25,8 @@
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
+
         <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
         <jrebel.version>1.1.8</jrebel.version>
 
diff --git a/pom.xml b/pom.xml
index 57600384..8f850a11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
 
     <licenses>
         <license>
-            <name>GNU Lesser General Public License v3.0 or later</name>
-            <url>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</url>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
 
@@ -33,85 +33,6 @@
         <tag>alfresco-sdk-aggregator-4.2.0-SNAPSHOT</tag>
     </scm>
 
-    <developers>
-
-        <developer>
-            <id>ohej</id>
-            <name>Ole Hejlskov</name>
-            <email>ole@phpfreak.dk</email>
-            <url>http://ohej.dk/</url>
-            <organization>Alfresco</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+1</timezone>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>gravitonian</id>
-            <name>Martin Bergljung</name>
-            <email>martin.bergljung@alfresco.com</email>
-            <url>https://sites.google.com/site/gravitonian/</url>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+0</timezone>
-            <roles>
-                <role>Architect</role>
-                <role>Developer</role>
-            </roles>
-        </developer>
-    </developers>
-
-    <contributors>
-        <contributor>
-            <name>Gabriele Columbro</name>
-            <email>gabriele.columbro@alfresco.com</email>
-            <url>http://mindthegab.com</url>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>-5</timezone>
-        </contributor>
-        <contributor>
-            <name>Maurizio Pillitu</name>
-            <email>maurizio.pillitu@alfresco.com</email>
-            <url>http://session.it</url>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+1</timezone>
-        </contributor>
-        <contributor>
-            <name>Carlo Sciolla</name>
-            <email>carlo@backbase.com</email>
-            <organization>Backbase</organization>
-            <organizationUrl>http://www.backbase.com</organizationUrl>
-            <timezone>+1</timezone>
-            <url>http://skuro.tk</url>
-        </contributor>
-        <contributor>
-            <name>Samuel Langlois</name>
-            <email>samuel.langlois@alfresco.com</email>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+0</timezone>
-            <url>https://twitter.com/samuel_langlois</url>
-        </contributor>
-        <contributor>
-            <name>Ray Gauss II</name>
-            <email>ray.gauss@alfresco.com</email>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>-5</timezone>
-            <url>http://rgauss.com/</url>
-        </contributor>
-        <contributor>
-            <name>Jose Luis Osorno Gil</name>
-            <email>joseluis.osorno@ixxus.com</email>
-            <organization>Ixxus</organization>
-            <organizationUrl>http://www.ixxus.com</organizationUrl>
-            <timezone>+1</timezone>
-        </contributor>
-    </contributors>
-
     <!-- All the modules of the Alfresco SDK -->
     <modules>
         <!-- Modules -->
@@ -123,7 +44,6 @@
         <module>archetypes/alfresco-share-jar-archetype</module>
         <module>archetypes/alfresco-allinone-archetype</module>
         <module>archetypes/archetypes-it</module>
-
   </modules>
 
     <properties>
@@ -139,8 +59,17 @@
         <alfresco.share.version>7.0.0-M3</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>
-
-        <test.acs.endpoint.path />
+        <keystore.settings>
+            -Dencryption.keystore.type=JCEKS
+            -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding
+            -Dencryption.keyAlgorithm=AES
+            -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
+            -Dmetadata-keystore.password=mp6yc0UD9e
+            -Dmetadata-keystore.aliases=metadata
+            -Dmetadata-keystore.metadata.password=oKIWzVdEdA
+            -Dmetadata-keystore.metadata.algorithm=AES
+        </keystore.settings>
+        <test.acs.endpoint.path/>
 
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
     </properties>
@@ -316,6 +245,7 @@
                 <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>
+                <keystore.settings></keystore.settings>
             </properties>
         </profile>
 
@@ -327,6 +257,7 @@
                 <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>
+                <keystore.settings></keystore.settings>
             </properties>
         </profile>
 
@@ -340,6 +271,7 @@
                 <alfresco.share.version>6.1.0-RC3</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></keystore.settings>
             </properties>
         </profile>
 
@@ -351,6 +283,7 @@
                 <alfresco.share.version>6.1.0</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>
+                <keystore.settings></keystore.settings>
             </properties>
         </profile>
 
@@ -364,6 +297,7 @@
                 <alfresco.share.version>6.2.0</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></keystore.settings>
             </properties>
         </profile>
 
@@ -375,6 +309,7 @@
                 <alfresco.share.version>6.2.0</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>
+                <keystore.settings></keystore.settings>
             </properties>
         </profile>
 
@@ -517,4 +452,83 @@
          -->
     </profiles>
 
+    <developers>
+
+        <developer>
+            <id>ohej</id>
+            <name>Ole Hejlskov</name>
+            <email>ole@phpfreak.dk</email>
+            <url>http://ohej.dk/</url>
+            <organization>Alfresco</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+1</timezone>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <id>gravitonian</id>
+            <name>Martin Bergljung</name>
+            <email>martin.bergljung@alfresco.com</email>
+            <url>https://sites.google.com/site/gravitonian/</url>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+0</timezone>
+            <roles>
+                <role>Architect</role>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <contributors>
+        <contributor>
+            <name>Gabriele Columbro</name>
+            <email>gabriele.columbro@alfresco.com</email>
+            <url>http://mindthegab.com</url>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>-5</timezone>
+        </contributor>
+        <contributor>
+            <name>Maurizio Pillitu</name>
+            <email>maurizio.pillitu@alfresco.com</email>
+            <url>http://session.it</url>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+1</timezone>
+        </contributor>
+        <contributor>
+            <name>Carlo Sciolla</name>
+            <email>carlo@backbase.com</email>
+            <organization>Backbase</organization>
+            <organizationUrl>http://www.backbase.com</organizationUrl>
+            <timezone>+1</timezone>
+            <url>http://skuro.tk</url>
+        </contributor>
+        <contributor>
+            <name>Samuel Langlois</name>
+            <email>samuel.langlois@alfresco.com</email>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+0</timezone>
+            <url>https://twitter.com/samuel_langlois</url>
+        </contributor>
+        <contributor>
+            <name>Ray Gauss II</name>
+            <email>ray.gauss@alfresco.com</email>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>-5</timezone>
+            <url>http://rgauss.com/</url>
+        </contributor>
+        <contributor>
+            <name>Jose Luis Osorno Gil</name>
+            <email>joseluis.osorno@ixxus.com</email>
+            <organization>Ixxus</organization>
+            <organizationUrl>http://www.ixxus.com</organizationUrl>
+            <timezone>+1</timezone>
+        </contributor>
+    </contributors>
+
 </project>