diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d27918b18df10b85efde4f60b8e7da61ad0e9747..f7639d64ece24578fcc0df4f94171f0d3d46a601 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ test:
         - "*/build/test-results/**/TEST-*.xml"
         - "*/build/reports/*.xml"
   rules:
-    - if: "$CI_COMMIT_BRANCH == 'master'"
+    - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH == 'master'"
       when: on_success
 
 release-artifacts:
@@ -52,7 +52,7 @@ release-artifacts:
     paths:
       - "build/libs/*"
   rules:
-    - if: "$CI_COMMIT_TAG && $CI_COMMIT_BRANCH == 'master'"
+    - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH == 'master'"
       when: on_success
 release-docs:
   stage: "release"
@@ -65,5 +65,5 @@ release-docs:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}-docs --destination $CI_REGISTRY_IMAGE:docs
   rules:
-    - if: "$CI_COMMIT_BRANCH == 'master'"
+    - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH == 'master'"
       when: on_success