diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 301c2dfece781dfc628d7e915f380684c1b79dbe..2ea384295b20eb3ac4f6cc90823b8200f5d14fed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,6 +190,8 @@ tag-latest-docker-image:
             "docker://$CI_REGISTRY_IMAGE/$image:$TAG_NEW"
         echo Tagged "$CI_REGISTRY_IMAGE/$image:$TAG_NEW"
       done
-  only:
-    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH
+  rules:
+    - if: $CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH
+      when: always
+    - if: $CI_COMMIT_BRANCH =~ /\/(production|staging)$/
+      when: always