diff --git a/e2e-test/release-testing/insight-engine-sharding/acl_id/.env b/e2e-test/release-testing/insight-engine-sharding/acl_id/.env
index 157fef7af..d1d154f06 100755
--- a/e2e-test/release-testing/insight-engine-sharding/acl_id/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/acl_id/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.2-RC1
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml
index 7022b45e8..9ddf7255c 100755
--- a/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-                -Dencryption.keystore.type=JCEKS
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-                -Dencryption.keyAlgorithm=DESede
-                -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=DESede
-                "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
diff --git a/e2e-test/release-testing/insight-engine-sharding/date/.env b/e2e-test/release-testing/insight-engine-sharding/date/.env
index 8f3ce5f38..52b6cdc3c 100755
--- a/e2e-test/release-testing/insight-engine-sharding/date/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/date/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.2-RC1
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml
index 90c954edb..33cd6fc1d 100755
--- a/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-                -Dencryption.keystore.type=JCEKS
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-                -Dencryption.keyAlgorithm=DESede
-                -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=DESede
-                "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
diff --git a/e2e-test/release-testing/insight-engine-sharding/db_id/.env b/e2e-test/release-testing/insight-engine-sharding/db_id/.env
index 157fef7af..d1d154f06 100755
--- a/e2e-test/release-testing/insight-engine-sharding/db_id/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/db_id/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.2-RC1
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml
index ebf9f821b..b125537f5 100755
--- a/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-              -Dencryption.keystore.type=JCEKS
-              -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-              -Dencryption.keyAlgorithm=DESede
-              -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=DESede
-              "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
diff --git a/e2e-test/release-testing/insight-engine-sharding/db_id_range/.env b/e2e-test/release-testing/insight-engine-sharding/db_id_range/.env
index 7021f3f9f..c2e4b4b38 100755
--- a/e2e-test/release-testing/insight-engine-sharding/db_id_range/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/db_id_range/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.0-RC3
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml
index 5dc7cacb1..43f6d5999 100755
--- a/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-              -Dencryption.keystore.type=JCEKS
-              -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-              -Dencryption.keyAlgorithm=DESede
-              -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=DESede
-              "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
diff --git a/e2e-test/release-testing/insight-engine-sharding/explicit_id/.env b/e2e-test/release-testing/insight-engine-sharding/explicit_id/.env
index 157fef7af..d1d154f06 100755
--- a/e2e-test/release-testing/insight-engine-sharding/explicit_id/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/explicit_id/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.2-RC1
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml
index 1542cc03d..6255616d0 100755
--- a/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-              -Dencryption.keystore.type=JCEKS
-              -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-              -Dencryption.keyAlgorithm=DESede
-              -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=DESede
-              "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
diff --git a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/.env b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/.env
index 157fef7af..d1d154f06 100755
--- a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.2-RC1
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml
index a73660f07..65033fc6e 100755
--- a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-              -Dencryption.keystore.type=JCEKS
-              -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-              -Dencryption.keyAlgorithm=DESede
-              -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=DESede
-              "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
diff --git a/e2e-test/release-testing/insight-engine-sharding/property/.env b/e2e-test/release-testing/insight-engine-sharding/property/.env
index 157fef7af..d1d154f06 100755
--- a/e2e-test/release-testing/insight-engine-sharding/property/.env
+++ b/e2e-test/release-testing/insight-engine-sharding/property/.env
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=2.0.2-RC1
 ZEPPELIN_TAG=latest
 ACA_TAG=master-latest
+
+#To test versions before 7, please leave this property empty
+JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -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=DESede"
\ No newline at end of file
diff --git a/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml
index 5855a5e20..fa4183f6c 100755
--- a/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml
+++ b/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml
@@ -11,16 +11,7 @@ services:
             COMPRESS_CONTENT: "false"
         mem_limit: 1800m
         environment:
-            JAVA_TOOL_OPTIONS: "
-              -Dencryption.keystore.type=JCEKS
-              -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-              -Dencryption.keyAlgorithm=DESede
-              -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=DESede
-              "
+            JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco