diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e99cc9037001fe0c058c4ba36c72ea878821ff74..f8472bf5c5b4af807a3d625aea53b709db7426cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,7 @@ stages:
 docker_store_images_master_tag:
   extends: .base_docker_store_images
   rules:
-    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) && $CI_COMMIT_TAG
+    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
 
 # Download all remote images and store them on our image registry if .env changes
 # on a merge request
@@ -85,7 +85,7 @@ docker_store_images_changes:
 docker_build_image_all:
   extends: .base_docker_images
   rules:
-    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) && $CI_COMMIT_TAG
+    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
   script:
 #    Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh elk latest
@@ -678,7 +678,7 @@ wheel_packaging:
   image: ubuntu:bionic
   when: manual
   rules:
-  - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) && $CI_COMMIT_TAG
+  - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
   before_script:
     - apt-get update
     - apt-get install ansible -y