diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a96d32e7b389644d12d485d98e3ca37cb286e3b4..762942c25823f34c77dfa4255f0e21b245f579cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,15 @@ test:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - chmod +x env_setup.sh wait_for_container.sh
     - ./env_setup.sh
-    - mkdir data 
+    - mkdir data
+    - docker build core/ --cache-from registry.gitlab.eox.at/esa/prism/vs/pvs_core -t registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
+    - docker build cache/ --cache-from registry.gitlab.eox.at/esa/prism/vs/pvs_cache -t registry.gitlab.eox.at/esa/prism/vs/pvs_cache:latest
+    - docker build preprocessor/ --cache-from registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor -t registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:latest
+    - docker build client/ --cache-from registry.gitlab.eox.at/esa/prism/vs/pvs_client -t registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
+    - docker push registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
+    - docker push registry.gitlab.eox.at/esa/prism/vs/pvs_cache:latest
+    - docker push registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:latest
+    - 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
   script:
@@ -92,6 +100,7 @@ test:
     - apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
     - pip3 install -r requirements.txt
     - ./wait_for_container.sh
+    - docker ps
     # - docker exec -it $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py id list
     # - docker exec -it $(docker ps -qf "name=emg-pvs_registrar") python3 /core/registrar.py --objects-prefix "OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar"
     # - pytest -s registrar_test.py --name OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar
diff --git a/wait_for_container.sh b/wait_for_container.sh
index 02cbdbdd60f46410eaa1e8e03e756f93bcad81c2..db40eb363bcf48b414c2c95701cc0a2ca7742287 100755
--- a/wait_for_container.sh
+++ b/wait_for_container.sh
@@ -9,8 +9,7 @@
 for run in 1 2 3; do
   for service in emg-pvs_preprocessor emg-pvs_renderer emg-pvs_registrar; do
      docker service ps --no-trunc $service
-     docker service inspect $service
   done 
-  sleep 150
+  sleep 30
 done