diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42f64bd..75f5282 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,7 @@ envars:
 commit_check:
   stage: test
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS !~ /skip-ci/
-    - when: never
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   variables:
     BADRX: '^(squash!)|(fixup!)'
   script: |
@@ -42,6 +41,10 @@ commit_check:
 
 build:
   stage: deploy
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   variables:
     BUILDAH_FORMAT: docker
     BUILDAH_ISOLATION: chroot