diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3b3afed6d0..83d39d0d7e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,8 +68,8 @@ stages:
     # Forked project branch / pre-merge pipeline not for Marge bot
     - if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME)'
       when: manual
-    # Pipeline runs for the master branch of the main project
-    - if: &is-main-master '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != "master"'
+    # Pipeline runs for the main branch of the upstream Mesa project
+    - if: &is-mesa-main '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_DEFAULT_BRANCH'
       when: always
     # Post-merge pipeline
     - if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
@@ -103,7 +103,7 @@ pages:
   needs: []
   rules:
     - *ignore_scheduled_pipelines
-    - if: *is-main-master
+    - if: *is-mesa-main
       changes: &docs-or-ci
       - docs/**/*
       - .gitlab-ci.yml
@@ -1204,7 +1204,7 @@ meson-mingw32-x86_64:
 
 # Rules for tests that should not be present in MRs or the main
 # project's pipeline (don't block marge or report red on
-# mesa/mesamaster) but should be present on pipelines in personal
+# mesa/mesa main) but should be present on pipelines in personal
 # branches (so you can opt in to running the flaky test when you want
 # to).
 .test-manual: