diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8f65d3db66e7f0c9c62141c190d6e6fc5c6f6b4..7cbbbd242ae66252bea208413e3773f1ac87d43a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,11 +53,13 @@ build:firefox:beta:
   variables:
     CHANNEL: unlisted
   rules:
-    - if: '($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta") || $CI_COMMIT_MESSAGE =~ /#force-build/'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
       changes:
         - shared/**
         - firefox/**
       when: always
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+      when: always
     - when: never
 
 
@@ -67,11 +69,13 @@ build:firefox:master:
   variables:
     CHANNEL: listed
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_MESSAGE =~ /#force-build/'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"'
       changes:
         - shared/**
         - firefox/**
       when: always
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+      when: always
     - when: never