diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index 4f6993358d0..62cd49f7591 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -4,45 +4,30 @@
     - .iris-rules
   variables:
     ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
+    DTB: ""
+    DRIVER_NAME: iris
+    BOOT_METHOD: depthcharge
+    KERNEL_IMAGE_TYPE: ""
+  tags:
+    - mesa-ci-aarch64-lava-collabora
 
 iris-apl-traces:amd64:
   extends:
     - .iris-traces:amd64
-    - .test-manual-mr
   variables:
     DEVICE_TYPE: asus-C523NA-A20057-coral
-    DTB: ""
     GPU_VERSION: intel-apl
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora
 
 iris-glk-traces:amd64:
   extends:
     - .iris-traces:amd64
-    - .test-manual-mr
   variables:
     DEVICE_TYPE: hp-x360-12b-n4000-octopus
-    DTB: ""
     GPU_VERSION: intel-glk
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora
 
 iris-amly-traces:amd64:
   extends:
     - .iris-traces:amd64
-    - .test-manual-mr
   variables:
     DEVICE_TYPE: asus-C433TA-AJ0005-rammus
-    DTB: ""
     GPU_VERSION: intel-amly
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora