diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f0fc475c00ca5ee71875e48ff9367e331fa182f..a3b8bb6f476d2a1b3f4b7276d99d8c15848fffde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ build:firefox:beta:
         - shared/**
         - firefox/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "beta"'
       when: always
     - when: never
 
@@ -74,7 +74,7 @@ build:firefox:master:
         - shared/**
         - firefox/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "master"'
       when: always
     - when: never
 
@@ -96,7 +96,7 @@ build:thunderbird:beta:
         - shared/**
         - thunderbird/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "beta"'
       when: always
     - when: never
 
@@ -120,6 +120,9 @@ pages:
       job: build:firefox:beta
       ref: $CI_COMMIT_REF_NAME
       artifacts: true
+  dependencies:
+    - build:firefox:beta
+    - build:thunderbird:beta
   artifacts:
     paths:
       - public/