diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 9dbc666a455..c9ba71a5b97 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -298,23 +298,27 @@ a660-vk-full:
     DEQP_FRACTION: 1
 
 # X11 takes over the screen, wayland is run headless.
-.a630-gl:
+a630-gl:
   extends:
     - .baremetal-deqp-test
     - .google-freedreno-test-gl
     - .a630-test
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   parallel: 3
   variables:
     DEQP_SUITE: freedreno-a630
     HWCI_START_XORG: 1
     HWCI_START_WESTON: 1
 
-.a630-gles-asan:
+a630-gles-asan:
   extends:
     - .baremetal-deqp-test
     - .google-freedreno-test-gl
     - .a630-test
     - .baremetal-arm64-asan-test-gl
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     DEQP_SUITE: freedreno-a630-gles-asan
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
@@ -325,19 +329,23 @@ a630-gles-asan-full:
   # together with the other a630 jobs, uses 4 of the 6 devices available.
   timeout: 1h
   extends:
-    - .a630-gles-asan
+    - a630-gles-asan
     - .a630-full
     - .google-freedreno-manual-rules
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     DEQP_SUITE: freedreno-a630-gles-asan-full
     TEST_PHASE_TIMEOUT_MINUTES: 55
 
-.a630-vk:
+a630-vk:
   extends:
     - .google-freedreno-test-vk
     - .a630-test
     - .baremetal-deqp-test
     - .google-turnip-rules
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     DEQP_SUITE: freedreno-a630-vk
 
@@ -348,26 +356,30 @@ a630-vk-full:
   # blocking up normal merges, so going more parallel doesn't make any sense.
   timeout: 2h
   extends:
-    - .a630-vk
+    - a630-vk
     - .a630-full
     - .google-turnip-manual-rules
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   parallel: 2
   variables:
     DEQP_SUITE: freedreno-a630-vk-full
     TEST_PHASE_TIMEOUT_MINUTES: 115
 
-.a630-vk-asan:
+a630-vk-asan:
   extends:
     - .google-freedreno-test-vk
     - .a630-test
     - .baremetal-deqp-test
     - .baremetal-arm64-asan-test-vk
     - .google-turnip-rules
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     DEQP_SUITE: freedreno-a630-vk-asan
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
 
-.a630-piglit:
+a630-piglit:
   extends:
     - .google-freedreno-test-gl
     - .baremetal-deqp-test
@@ -375,6 +387,8 @@ a630-vk-full:
     - .test-piglit
     # Note that piglit has GL+VK integration testing.
     - .google-freedreno-turnip-rules
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     HWCI_START_WESTON: 1
     DEQP_SUITE: freedreno-a630-piglit
@@ -387,6 +401,8 @@ a630-piglit-full:
     - .test-piglit
     # Note that piglit has GL+VK integration testing.
     - .google-freedreno-turnip-manual-rules
+  rules:
+    - when: never  # Cheza DUTs are retired and no longer active
   timeout: 60m
   variables:
     HWCI_START_WESTON: 1
@@ -399,7 +415,7 @@ a630-traces:
     - .google-freedreno-test-gl
     - .a630-test
   rules:
-    - when: never # Google nginx needs updating
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a630"
     PIGLIT_RESULTS: "freedreno-a630-replay"
@@ -414,7 +430,7 @@ a630-traces-restricted:
     - a630-traces
     - .google-freedreno-rules-restricted
   rules:
-    - when: never # Google nginx needs updating
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     PIGLIT_TRACES_FILE: restricted-traces-freedreno.yml
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}"
@@ -425,7 +441,7 @@ a630-traces-performance:
     - a630-traces
     - .google-freedreno-rules-performance
   rules:
-    - when: never # Google nginx needs updating
+    - when: never  # Cheza DUTs are retired and no longer active
   variables:
     PIGLIT_REPLAY_SUBCOMMAND: "profile"
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/"