diff --git a/.travis.yml b/.travis.yml
index eaca166b..2b9d3f9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 import:
+  - source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.0.1
   - source: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.1
+  - source: Alfresco/alfresco-build-tools:.travis.pre-commit.yml@v1.0.1
 
 dist: focal
 
@@ -13,6 +15,7 @@ branches:
     - /feature\/.*/
     - /fix\/.*/
     - sdk-4.2
+    - /dev\/sdk-4.2-keystore/
 
 stages:
   - name: test
@@ -23,7 +26,7 @@ stages:
 env:
   global:
     - MAVEN_INSTALL_CMD="mvn clean install -B"
-    
+
 jobs:
   include:
   
@@ -32,6 +35,16 @@ jobs:
       script: 
         - ${MAVEN_INSTALL_CMD}
     
+    - name: "7.0 Enterprise"
+      stage: test
+      script:
+        - ${MAVEN_INSTALL_CMD} -Penterprise-70-tests
+    
+    - name: "7.0 Community"
+      stage: test
+      script:
+        - ${MAVEN_INSTALL_CMD} -Pcommunity-70-tests
+
     - name: "6.2 Enterprise"
       stage: test
       script:
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 e771e082..7e0dffe9 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,6 +19,15 @@ 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"
       CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
@@ -57,4 +66,4 @@ volumes:
   ${rootArtifactId}-db-volume:
     external: true
   ${rootArtifactId}-ass-volume:
-    external: true
\ No newline at end of file
+    external: true
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 7ac0fe2d..fd7bacc5 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,6 +15,15 @@ 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"
       CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
@@ -53,4 +62,4 @@ volumes:
   ${rootArtifactId}-db-volume:
     external: true
   ${rootArtifactId}-ass-volume:
-    external: true
\ No newline at end of file
+    external: true
diff --git a/pom.xml b/pom.xml
index 10ce20bd..57600384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,8 +349,8 @@
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.1.0</alfresco.platform.version>
                 <alfresco.share.version>6.1.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>
+                <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>
             </properties>
         </profile>
 
@@ -373,8 +373,8 @@
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>6.2.0</alfresco.platform.version>
                 <alfresco.share.version>6.2.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>
+                <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>
             </properties>
         </profile>
 
@@ -397,8 +397,8 @@
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
                 <alfresco.platform.version>7.0.0-A20</alfresco.platform.version>
                 <alfresco.share.version>7.0.0-M3</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>
+                <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>
             </properties>
         </profile>
 
@@ -517,4 +517,4 @@
          -->
     </profiles>
 
-</project>
\ No newline at end of file
+</project>