diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml
index 1885f2a284..c61ac974af 100644
--- a/.gitlab/CI/publish.gitlab-ci.yml
+++ b/.gitlab/CI/publish.gitlab-ci.yml
@@ -5,9 +5,9 @@
   tags:
     - veloren-docker
   rules:
-    - when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
+    - when: never
 
 docker:
   extends: .publish
diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml
index efddd5e6e5..5f0dfc86ea 100644
--- a/.gitlab/CI/release.yml
+++ b/.gitlab/CI/release.yml
@@ -4,10 +4,10 @@
   tags:
     - veloren-docker
   rules:
-    - when: manual
-      allow_failure: true
     - if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ || $CI_PIPELINE_SOURCE == "schedule"
       when: never
+    - when: manual
+      allow_failure: true
 
 # Template to only run if pushes to master or a tag happened
 .release: