diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1bef6017a7a86bc997bf3487ec91087556207eb..6cc0c3f86bddb0814db207b1bf1ffb40093fa744 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,16 +107,9 @@ collect:
   stage: collect
   script:
     - echo "done"
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
-      changes:
-        - shared/**
-        - thunderbird/**
-        - firefox/**
-      when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox|thunderbird)/ && $CI_COMMIT_BRANCH == "beta"'
-      when: always
-    - when: never
+  only:
+    - master
+    - beta
 
 
 pages:
@@ -129,7 +122,7 @@ pages:
     - mv .public public
     - ls -lr public
   needs:
-    - job: prepare
+    - job: collect
     - project: $CI_PROJECT_PATH
       job: build:thunderbird:beta
       ref: $CI_COMMIT_REF_NAME