diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e68859c9478b370033d23d3ce4aabf7944bd46a..815ed1ad895956ad1f5d19e0b9a7c4581353b262 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,6 @@ test:
     - docker push registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
     - docker swarm init
     - docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
-    - export UPLOAD_CONTAINER=pvs_testing
   script:
     # - swift post --auth-version $ST_AUTH_VERSION_DOWNLOAD --os-identity-api-version 3 --os-auth-url $OS_AUTH_URL_DOWNLOAD --os-username $OS_USERNAME_DOWNLOAD --os-password $OS_PASSWORD_DOWNLOAD --os-tenant-name $OS_TENANT_NAME_DOWNLOAD --os-tenant-id $OS_TENANT_ID_DOWNLOAD --os-region-name $OS_REGION_NAME_DOWNLOAD preprocessor_test
     - apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
diff --git a/env_setup.sh b/env_setup.sh
index c106611e745a46536afd6e2995c8a60a63cb9317..21c7aa9fcf8d3e59bb2ff61dc780a9a054940f9c 100644
--- a/env_setup.sh
+++ b/env_setup.sh
@@ -6,3 +6,6 @@ cat $vhr18_obs > ./env/vhr18_obs.env
 cat $emg_db > ./env/emg_db.env
 cat $emg_django > ./env/emg_django.env
 cat $emg_obs > ./env/emg_obs.env
+
+sed -i -e 's/emg-data/pvs-testing/g' ./env/emg.env
+sed -i -e 's/vhr18-data/pvs-testing/g' ./env/emg.env
diff --git a/wait_for_container.sh b/wait_for_container.sh
index 673b23f9198103eed69a921a7a6104792a06ac71..9f93de8ef50996f24210efff985d2794c4ae8f3a 100755
--- a/wait_for_container.sh
+++ b/wait_for_container.sh
@@ -6,8 +6,8 @@ while [ -z $(docker ps -qf "name=emg-pvs_renderer") ]; do
   done
 
 
-for service in emg-pvs_preprocessor emg-pvs_renderer emg-pvs_registrar; do
-  #  docker service ps --no-trunc $service
-    docker service logs $service
-done
+# for service in emg-pvs_preprocessor emg-pvs_renderer emg-pvs_registrar; do
+#   #  docker service ps --no-trunc $service
+#     docker service logs $service
+# done