diff --git a/e2e-test/.gitignore b/e2e-test/.gitignore
index 62b80d515..2470b132f 100644
--- a/e2e-test/.gitignore
+++ b/e2e-test/.gitignore
@@ -36,3 +36,5 @@ image-digests.txt
 qa/search/upgrade/solr-data
 qa/search/upgrade/solr-contentstore
 qa/upgrade/upgrade
+
+e2e-test/release-testing/**/.env
diff --git a/e2e-test/release-testing/insight-engine-sharding-replica/.env b/e2e-test/release-testing/insight-engine-sharding-replica/.env
deleted file mode 100755
index 7021f3f9f..000000000
--- a/e2e-test/release-testing/insight-engine-sharding-replica/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.2
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/insight-engine-sharding/acl_id/.env b/e2e-test/release-testing/insight-engine-sharding/acl_id/.env
deleted file mode 100755
index d1d154f06..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/acl_id/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=7.1.0-A8
-ALFRESCO_CE_TAG=7.1.0-A8
-SHARE_TAG=7.1.0-A8
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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/.env b/e2e-test/release-testing/insight-engine-sharding/date/.env
deleted file mode 100755
index 52b6cdc3c..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/date/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=7.1.0-A8
-ALFRESCO_CE_TAG=7.1.0-A8
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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/.env b/e2e-test/release-testing/insight-engine-sharding/db_id/.env
deleted file mode 100755
index d1d154f06..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/db_id/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=7.1.0-A8
-ALFRESCO_CE_TAG=7.1.0-A8
-SHARE_TAG=7.1.0-A8
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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_range/.env b/e2e-test/release-testing/insight-engine-sharding/db_id_range/.env
deleted file mode 100755
index c2e4b4b38..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/db_id_range/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=6.2.2
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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/explicit_id/.env b/e2e-test/release-testing/insight-engine-sharding/explicit_id/.env
deleted file mode 100755
index d1d154f06..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/explicit_id/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=7.1.0-A8
-ALFRESCO_CE_TAG=7.1.0-A8
-SHARE_TAG=7.1.0-A8
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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/.env b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/.env
deleted file mode 100755
index d1d154f06..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=7.1.0-A8
-ALFRESCO_CE_TAG=7.1.0-A8
-SHARE_TAG=7.1.0-A8
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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/.env b/e2e-test/release-testing/insight-engine-sharding/property/.env
deleted file mode 100755
index d1d154f06..000000000
--- a/e2e-test/release-testing/insight-engine-sharding/property/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-ALFRESCO_TAG=7.1.0-A8
-ALFRESCO_CE_TAG=7.1.0-A8
-SHARE_TAG=7.1.0-A8
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-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-zeppelin/.env b/e2e-test/release-testing/insight-engine-zeppelin/.env
deleted file mode 100755
index 5c82f3a36..000000000
--- a/e2e-test/release-testing/insight-engine-zeppelin/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.2
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=2.0.0-RC3
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/insight-engine/.env b/e2e-test/release-testing/insight-engine/.env
deleted file mode 100755
index 7021f3f9f..000000000
--- a/e2e-test/release-testing/insight-engine/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.2
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/mtls/insight-engine/.env b/e2e-test/release-testing/mtls/insight-engine/.env
deleted file mode 100755
index 710bfa0b4..000000000
--- a/e2e-test/release-testing/mtls/insight-engine/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=2.0.0-RC3
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/mtls/search-services/.env b/e2e-test/release-testing/mtls/search-services/.env
deleted file mode 100755
index 5c82f3a36..000000000
--- a/e2e-test/release-testing/mtls/search-services/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.2
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=2.0.0-RC3
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-backup/master-master/.env b/e2e-test/release-testing/search-services-backup/master-master/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services-backup/master-master/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-backup/master-slave/.env b/e2e-test/release-testing/search-services-backup/master-slave/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services-backup/master-slave/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-backup/normal/.env b/e2e-test/release-testing/search-services-backup/normal/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services-backup/normal/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-backup/sharding/.env b/e2e-test/release-testing/search-services-backup/sharding/.env
deleted file mode 100755
index 7021f3f9f..000000000
--- a/e2e-test/release-testing/search-services-backup/sharding/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.2
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-disable-tracking/.env b/e2e-test/release-testing/search-services-disable-tracking/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services-disable-tracking/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-replication/master-master/.env b/e2e-test/release-testing/search-services-replication/master-master/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services-replication/master-master/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-replication/master-slave/.env b/e2e-test/release-testing/search-services-replication/master-slave/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services-replication/master-slave/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-upgrade/current-ie/.env b/e2e-test/release-testing/search-services-upgrade/current-ie/.env
deleted file mode 100755
index be3f573f6..000000000
--- a/e2e-test/release-testing/search-services-upgrade/current-ie/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=1.4.3.0-RC1
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-upgrade/current/.env b/e2e-test/release-testing/search-services-upgrade/current/.env
deleted file mode 100755
index be3f573f6..000000000
--- a/e2e-test/release-testing/search-services-upgrade/current/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=1.4.3.0-RC1
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services-upgrade/previous/.env b/e2e-test/release-testing/search-services-upgrade/previous/.env
deleted file mode 100755
index 203720589..000000000
--- a/e2e-test/release-testing/search-services-upgrade/previous/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=1.3.1
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest
diff --git a/e2e-test/release-testing/search-services/.env b/e2e-test/release-testing/search-services/.env
deleted file mode 100755
index 172b7e830..000000000
--- a/e2e-test/release-testing/search-services/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-ALFRESCO_TAG=6.2.1
-ALFRESCO_CE_TAG=6.2.0-ga
-SHARE_TAG=6.2.1
-POSTGRES_TAG=11.4
-TRANSFORM_ROUTER_TAG=1.2.0
-TRANSFORM_CORE_AIO_TAG=2.2.1
-TRANSFORMER_TAG=2.1.0
-SHARED_FILE_STORE_TAG=0.7.0
-ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.5.0
-ACS_NGINX_TAG=3.0.1
-ACS_COMMUNITY_NGINX_TAG=1.0.0
-SEARCH_TAG=2.0.0-RC3
-ZEPPELIN_TAG=latest
-ACA_TAG=master-latest