diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cbbbd242ae66252bea208413e3773f1ac87d43a..13126ded84373bcbaa3ee75a114cb2a303caaf8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ build:firefox:master:
         - shared/**
         - firefox/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "master'
       when: always
     - when: never
 
@@ -96,6 +96,8 @@ build:thunderbird:beta:
         - shared/**
         - thunderbird/**
       when: always
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+      when: always
     - when: never
 
 pages:
@@ -108,6 +110,7 @@ pages:
     - mv .public public
     - ls -lr public
   needs:
+    - job: prepare
     - project: $CI_PROJECT_PATH
       job: build:thunderbird:beta
       ref: $CI_COMMIT_REF_NAME