diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd0230083a8050ab15cd84c704b3b94495aa986a..b6361546bdf49b72793bfb2cae69eff559790d0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,14 @@ test:
     - chmod +x env_setup.sh wait_for_container.sh
     - ./env_setup.sh
     - 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 network create -d overlay emg-extnet
     - docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs