diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a68f222e..e800dcdb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -342,11 +342,9 @@ multi-arch-release:
       - ARCH: ["arm", "arm64"]
   rules:
     # arm64 is allowed to fail
-    - if: '$CI_PROJECT_NAMESPACE == "framasoft" && $CI_PIPELINE_SOURCE == "schedule" && $ARCH == "arm64"'
-      when: on_success
+    - if: '$CI_PROJECT_NAMESPACE == "framasoft" && ($CI_PIPELINE_SOURCE == "schedule" || $CI_COMMIT_TAG != null) && $ARCH == "arm64"'
       allow_failure: true
-    - if: '$CI_PROJECT_NAMESPACE == "framasoft" && $CI_PIPELINE_SOURCE == "schedule" && $ARCH'
-      when: on_success
+    - if: '$CI_PROJECT_NAMESPACE == "framasoft" && ($CI_PIPELINE_SOURCE == "schedule" || $CI_COMMIT_TAG != null) && $ARCH'
       allow_failure: false
   timeout: 3h
   allow_failure: true