diff --git a/.docker-registry/run b/.docker-registry/run
new file mode 100644
index 0000000000000000000000000000000000000000..a07b131bc38d2757122c76666f9803c9b157d476
--- /dev/null
+++ b/.docker-registry/run
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run -d -p 5000:5000 -v /var/lib/docker/registry:/var/lib/registry registry:2
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6832a4334d926f3f8093a23532092f159700a84c..46dfa8e4caf70b29534ea11b00548a423a54ba76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -162,9 +162,30 @@ test-backend-citation:
       junit:
         - fda-citation-service/rest-service/target/surefire-reports/TEST-*.xml
 
-deploy-all:
+deploy-images:
   stage: deploy
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == "master"'
+    - when: manual
   script:
-    - docker-compose down
-    - docker-compose up -d
-    - docker-compose down
+    - docker tag fda-metadata-db dbrepo.ossdip.at/fda-metadata-db:latest
+    - docker tag fda-analyse-service dbrepo.ossdip.at/fda-analyse-service:latest
+    - docker tag fda-broker-service dbrepo.ossdip.at/fda-broker-service:latest
+    - docker tag fda-citation-service dbrepo.ossdip.at/fda-citation-service:latest
+    - docker tag fda-container-service dbrepo.ossdip.at/fda-container-service:latest
+    - docker tag fda-database-service dbrepo.ossdip.at/fda-database-service:latest
+    - docker tag fda-discovery-service dbrepo.ossdip.at/fda-discovery-service:latest
+    - docker tag fda-gateway-service dbrepo.ossdip.at/fda-gateway-service:latest
+    - docker tag fda-query-service dbrepo.ossdip.at/fda-query-service:latest
+    - docker tag fda-table-service dbrepo.ossdip.at/fda-table-service:latest
+    - docker tag fda-ui dbrepo.ossdip.at/fda-ui:latest
+    - docker push dbrepo.ossdip.at/fda-metadata-db:latest
+    - docker push dbrepo.ossdip.at/fda-analyse-service:latest
+    - docker push dbrepo.ossdip.at/fda-broker-service:latest
+    - docker push dbrepo.ossdip.at/fda-citation-service:latest
+    - docker push dbrepo.ossdip.at/fda-container-service:latest
+    - docker push dbrepo.ossdip.at/fda-discovery-service:latest
+    - docker push dbrepo.ossdip.at/fda-database-service:latest
+    - docker push dbrepo.ossdip.at/fda-gateway-service:latest
+    - docker push dbrepo.ossdip.at/fda-query-service:latest
+    - docker push dbrepo.ossdip.at/fda-table-service:latest