diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b84b655..5ade0bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,13 +45,11 @@
     - docker:dind
   stage: build
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - when: manual
-      variables:
-        VID: $CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
-        PERL_LOCAL_LIB_ROOT: ./perl5
-        PERL5LIB: ./perl5/lib/perl5
+    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_JOB_MANUAL == "true"'
+  variables:
+      VID: $CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
+      PERL_LOCAL_LIB_ROOT: ./perl5
+      PERL5LIB: ./perl5/lib/perl5
   cache:
     - key: DNB4KorAP
       paths:
@@ -109,9 +107,7 @@
   dependencies:
     - "build-index"
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - when: manual
+    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_JOB_MANUAL == "true"'
   image: rocker/verse
   before_script:
     - source `find .. -name section_helper.sh`