diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7da75360a42..f1aab649665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,7 +154,9 @@ stages:
   - nouveau
   - arm
   - broadcom
+  - broadcom-postmerge
   - freedreno
+  - freedreno-postmerge
   - etnaviv
   - software-renderer
   - layered-backends
diff --git a/src/broadcom/ci/gitlab-ci-inc.yml b/src/broadcom/ci/gitlab-ci-inc.yml
index 23cf83d3772..c3274fa30e4 100644
--- a/src/broadcom/ci/gitlab-ci-inc.yml
+++ b/src/broadcom/ci/gitlab-ci-inc.yml
@@ -40,7 +40,7 @@
       when: on_success
 
 .vc4-manual-rules:
-  stage: broadcom
+  stage: broadcom-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -67,7 +67,7 @@
       when: on_success
 
 .v3d-manual-rules:
-  stage: broadcom
+  stage: broadcom-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -85,7 +85,7 @@
     - !reference [.rusticl-rules, rules]
 
 .v3d-rusticl-manual-rules:
-  stage: broadcom
+  stage: broadcom-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.v3d-manual-rules, rules]
@@ -105,7 +105,7 @@
       when: on_success
 
 .v3dv-manual-rules:
-  stage: broadcom
+  stage: broadcom-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index 794f5f4d438..6fe14a92379 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -55,7 +55,7 @@
       when: on_success
 
 .google-freedreno-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -67,7 +67,7 @@
       when: manual
 
 .collabora-freedreno-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -101,7 +101,7 @@
       when: on_success
 
 .google-turnip-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -113,7 +113,7 @@
       when: manual
 
 .collabora-turnip-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -133,7 +133,7 @@
     - !reference [.google-turnip-rules, rules]
 
 .google-freedreno-turnip-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   rules:
     - !reference [.test, rules]
     - !reference [.google-freedreno-manual-rules, rules]
@@ -147,14 +147,14 @@
     - !reference [.collabora-turnip-rules, rules]
 
 .collabora-freedreno-turnip-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   rules:
     - !reference [.test, rules]
     - !reference [.collabora-freedreno-manual-rules, rules]
     - !reference [.collabora-turnip-manual-rules, rules]
 
 .valve-freedreno-turnip-manual-rules:
-  stage: freedreno
+  stage: freedreno-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]