diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 682bc01ad82..d5287b10e53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,6 +148,7 @@ stages:
   - build-misc
   - code-validation
   - amd
+  - amd-postmerge
   - intel
   - nouveau
   - arm
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 10a9c86ae09..b9692f4f44e 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -43,7 +43,7 @@
       when: on_success
 
 .radv-manual-rules:
-  stage: amd
+  stage: amd-postmerge
   rules:
     - !reference [.test, rules]
     - !reference [.vulkan-manual-rules, rules]
@@ -76,7 +76,7 @@
     - !reference [.radv-rules, rules]
 
 .radv-valve-manual-rules:
-  stage: amd
+  stage: amd-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -101,7 +101,7 @@
       when: on_success
 
 .radeonsi-vaapi-manual-rules:
-  stage: amd
+  stage: amd-postmerge
   rules:
     - !reference [.test, rules]
     - !reference [.collabora-farm-manual-rules, rules]
@@ -118,7 +118,7 @@
     - !reference [.radeonsi-rules, rules]
 
 .radeonsi-valve-manual-rules:
-  stage: amd
+  stage: amd-postmerge
   rules:
     - !reference [.test, rules]
     - !reference [.valve-farm-manual-rules, rules]