diff --git a/.gitignore b/.gitignore
index 7e3b0cd6a26b755aeac4422f530c331d25a0cc43..0a116f850780386a9fe1010b22164f4c7dbf8228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,6 +162,7 @@ cython_debug/
 
 # TeraFlowSDN-generated files
 tfs_runtime_env_vars.sh
+tfs_runtime_env_vars*.sh
 tfs_bchain_runtime_env_vars.sh
 delete_local_deployment.sh
 local_docker_deployment.sh
diff --git a/src/tests/scenario2/deploy_all.sh b/src/tests/scenario2/deploy_all.sh
index b1563ad3b7cfa8a0d34e05dd3fb237396e6c692d..086ea2a2ca9a6f1011633a7927ea4cae40d26db1 100755
--- a/src/tests/scenario2/deploy_all.sh
+++ b/src/tests/scenario2/deploy_all.sh
@@ -24,15 +24,19 @@ kubectl apply -f nfvsdn22/nginx-ingress-controller-dom4.yaml
 # Deploy TFS for Domain 1
 source nfvsdn22/deploy_specs_dom1.sh
 ./deploy.sh
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom1.sh
 
 # Deploy TFS for Domain 2
 source nfvsdn22/deploy_specs_dom2.sh
 ./deploy.sh
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom2.sh
 
 # Deploy TFS for Domain 3
 source nfvsdn22/deploy_specs_dom3.sh
 ./deploy.sh
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom3.sh
 
 # Deploy TFS for Domain 4
 source nfvsdn22/deploy_specs_dom4.sh
 ./deploy.sh
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom4.sh