diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3702b42eec6fa875b4e3b73b0691f1c0d2efda65..353c6c6257c419697ee1390334f69d141b4feefe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,25 +27,16 @@ build_docker:
     - cd Docker
     - bash build_docker.sh
     
-#push_docker_tags:
-#  image: docker:latest
-#  allow_failure: true
-#  stage: push_docker
-#  only: 
-#    - tags
-#  script: 
-#    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-#    - docker tag lofareosc/prefactor-ci:latest $CI_REGISTRY/prefactor-ci:$CI_COMMIT_REF_NAME
-#    - docker push $CI_REGISTRY/prefactor-ci:$CI_COMMIT_REF_NAME
-
-push_docker_master:
+push_docker_tags:
   image: docker:latest
+  allow_failure: true
   stage: push_docker
   only: 
-    - master
+    - tags
   script: 
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push lofareosc/prefactor-ci:latest
+    - docker tag lofareosc/prefactor-ci:latest $CI_REGISTRY/prefactor-ci:$CI_COMMIT_REF_NAME
+    - docker push $CI_REGISTRY/prefactor-ci:$CI_COMMIT_REF_NAME
 
 validate_scripts:
   stage: validate_cwl_scripts