diff --git a/ci/rules.yml b/ci/rules.yml
index 07c2c5bb..0b07448f 100644
--- a/ci/rules.yml
+++ b/ci/rules.yml
@@ -18,6 +18,19 @@
       allow_failure: true
     - when: never
 
+.rules-branch-manual-br-tag-and-MR-and-devel-always:
+  rules:
+    - if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always
+      allow_failure: false
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^br-\d+/
+      when: always
+      allow_failure: false
+    - if: $CI_COMMIT_BRANCH
+      when: manual
+      allow_failure: true
+    - when: never
+
 .rules-branch-manual-scheduled-and-test-branch-always:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
diff --git a/ci/test.yml b/ci/test.yml
index 12812d01..1b3089c5 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -4,7 +4,7 @@
 lint:
   stage: test
   extends:
-    - .rules-branch-manual-MR-and-devel-always
+    - .rules-branch-manual-br-tag-and-MR-and-devel-always
   script:
     - make lint
   tags: