diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index abb6ff14cbe..adc06a3266a 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -186,11 +186,6 @@ radeonsi-raven-va:amd64:
     MESA_LOADER_DRIVER_OVERRIDE: zink
 
 .deqp-test-valve:
-  extends:
-    # Keep all the dEQP jobs as manual trigger jobs for now, until we
-    # have enough resources to meet the throughput requirements for
-    # automatic pre-merge in the Mesa CI.
-    - .test-manual-mr
   variables:
     B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
     B2C_TEST_SCRIPT: ./install/deqp-runner.sh
@@ -288,6 +283,7 @@ vkcts-kabini-valve:
 .vkcts-stoney-valve:
   extends:
     - .vkcts-test-valve
+    - .test-manual-mr
   parallel: 2
   # The thin clients can't manage a full run in less than an hour
   # currently.  Interpolation suggests four more thin clients (6
@@ -307,6 +303,7 @@ vkcts-kabini-valve:
   extends:
     - .vkcts-test-valve
     - .polaris10-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: radv-polaris10-aco
 
@@ -314,6 +311,7 @@ vkcts-vega10-valve:
   extends:
     - .vkcts-test-valve
     - .vega10-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: radv-vega10-aco
 
@@ -321,6 +319,7 @@ vkcts-renoir-valve:
   extends:
     - .vkcts-test-valve
     - .renoir-test-valve
+    - .test-manual-mr
   timeout: 2h 10m
   variables:
     GPU_VERSION: radv-renoir-aco
@@ -329,6 +328,7 @@ vkcts-navi10-valve:
   extends:
     - .vkcts-test-valve
     - .navi10-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: radv-navi10-aco
 
@@ -337,6 +337,7 @@ vkcts-navi21-valve:
   extends:
     - .vkcts-test-valve
     - .navi21-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: radv-navi21-aco
 
@@ -344,6 +345,7 @@ vkcts-navi21-llvm-valve:
   extends:
     - .vkcts-test-valve
     - .navi21-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: radv-navi21-llvm
     RADV_DEBUG: llvm,checkir
@@ -353,6 +355,7 @@ vkcts-vangogh-valve:
   extends:
     - .vkcts-test-valve
     - .vangogh-test-valve
+    - .test-manual-mr
   timeout: 2h 10m
   variables:
     GPU_VERSION: radv-vangogh-aco
@@ -362,6 +365,7 @@ vkcts-vangogh-valve:
   extends:
     - .b2c-test-radv-gl
     - .deqp-test-valve
+    - .test-manual-mr
   variables:
     DEQP_VER: gl46
 
@@ -369,6 +373,7 @@ glcts-navi10-valve:
   extends:
     - .glcts-test-valve
     - .navi10-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: zink-radv
 
@@ -376,6 +381,7 @@ glcts-navi10-valve:
   extends:
     - .b2c-test-radv-gl
     - .deqp-test-valve
+    - .test-manual-mr
   variables:
     DEQP_SUITE: zink-radv
 
@@ -383,6 +389,7 @@ gles-navi10-valve:
   extends:
     - .gles-test-valve
     - .navi10-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: zink-radv
 
@@ -390,10 +397,6 @@ gles-navi10-valve:
 .piglit-test-valve:
   extends:
     - .b2c-test-radv-gl
-    # Keep all the piglit jobs as manual trigger jobs for now, until we
-    # have enough resources to meet the throughput requirements for
-    # automatic pre-merge in the Mesa CI.
-    - .test-manual-mr
   variables:
     B2C_JOB_SUCCESS_REGEX: '^\+ PIGLIT_EXITCODE=0\r$'
     B2C_TEST_SCRIPT: ./install/piglit/piglit-runner.sh
@@ -404,6 +407,7 @@ piglit-navi10-valve:
   extends:
     - .piglit-test-valve
     - .navi10-test-valve
+    - .test-manual-mr
   variables:
     GPU_VERSION: zink-radv
 
@@ -440,10 +444,6 @@ radv-fossils:
 .vkd3d-test-valve:
   extends:
     - .b2c-test-radv-vk
-    # Keep all the vkd3d-proton jobs as manual trigger jobs for now, until we
-    # have enough resources to meet the throughput requirements for
-    # automatic pre-merge in the Mesa CI.
-    - .test-manual-mr
   variables:
     B2C_JOB_SUCCESS_REGEX: 'SUCCESS: No changes found!\r$'
     B2C_TEST_SCRIPT: ./install/vkd3d-proton/run.sh
@@ -452,6 +452,7 @@ radv-fossils:
   extends:
     - .vkd3d-test-valve
     - .kabini-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-kabini-vkd3d
 
@@ -459,6 +460,7 @@ radv-fossils:
   extends:
     - .vkd3d-test-valve
     - .polaris10-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-polaris10-vkd3d
 
@@ -466,6 +468,7 @@ vkd3d-vega10-valve:
   extends:
     - .vkd3d-test-valve
     - .vega10-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-vega10-vkd3d
 
@@ -473,6 +476,7 @@ vkd3d-renoir-valve:
   extends:
     - .vkd3d-test-valve
     - .renoir-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-renoir-vkd3d
 
@@ -480,6 +484,7 @@ vkd3d-navi10-valve:
   extends:
     - .vkd3d-test-valve
     - .navi10-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-navi10-vkd3d
 
@@ -487,6 +492,7 @@ vkd3d-navi21-valve:
   extends:
     - .vkd3d-test-valve
     - .navi21-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-navi21-vkd3d
 
@@ -494,5 +500,6 @@ vkd3d-vangogh-valve:
   extends:
     - .vkd3d-test-valve
     - .vangogh-test-valve
+    - .test-manual-mr
   variables:
     VKD3D_PROTON_RESULTS: radv-vangogh-vkd3d