diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 94c84cce6e9..bb33d64b39d 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -31,58 +31,43 @@
         *etnaviv_file_list
       when: manual
 
-
-.etnaviv-test:arm32:
-  extends:
-    - .baremetal-test-arm32
-    - .etnaviv-rules
-  script:
-    - ./install/bare-metal/fastboot.sh
-  timeout: 20m
+# 1 devices (2023-12-16)
+.austriancoder-imx6q-cubox-i:arm32:
   variables:
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
-    BM_KERNEL: zImage
-    FLAKES_CHANNEL: "#etnaviv-ci"
-
-.etnaviv-test:arm64:
-  extends:
-    - .baremetal-test-arm64
-    - .etnaviv-rules
-  script:
-    - ./install/bare-metal/fastboot.sh
-  timeout: 20m
-  variables:
-    BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
-    BM_KERNEL: Image
-    FLAKES_CHANNEL: "#etnaviv-ci"
-
-.etnaviv-gc2000:arm32:
-  extends:
-    - .etnaviv-test:arm32
-  variables:
     BM_DTB: imx6q-cubox-i
+    BM_KERNEL: zImage
     DEQP_EXPECTED_RENDERER: GC2000
     GPU_VERSION: "etnaviv-gc2000"
+  script:
+    - ./install/bare-metal/fastboot.sh
   tags:
     - etnaviv-gc2000
 
-.etnaviv-gc7000:arm64:
-  extends:
-    - .etnaviv-test:arm64
+# 1 devices (2023-12-16)
+.austriancoder-imx8mq-nitrogen:arm64:
   variables:
+    BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
     BM_DTB: imx8mq-nitrogen
+    BM_KERNEL: Image
     DEQP_EXPECTED_RENDERER: GC7000
     GPU_VERSION: "etnaviv-gc7000"
+  script:
+    - ./install/bare-metal/fastboot.sh
   tags:
     - austriancoder-etnaviv-imx8mq-nitrogen
 
+
 gc2000_gles2:
   extends:
-    - .etnaviv-gc2000:arm32
+    - .baremetal-test-arm32
+    - .austriancoder-imx6q-cubox-i:arm32
     - .etnaviv-manual-rules
   variables:
+    FLAKES_CHANNEL: "#etnaviv-ci"
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     DEQP_VER: gles2
+  timeout: 20m
 
 gc2000_gles2_asan:
   extends:
@@ -95,9 +80,11 @@ gc2000_gles2_asan:
 gc2000_piglit:
   extends:
     - .piglit-test
-    - .etnaviv-gc2000:arm32
+    - .baremetal-test-arm32
+    - .austriancoder-imx6q-cubox-i:arm32
     - .etnaviv-manual-rules
   variables:
+    FLAKES_CHANNEL: "#etnaviv-ci"
     PIGLIT_PLATFORM: gbm
     PIGLIT_PROFILES: gpu
     TEST_PHASE_TIMEOUT: 40
@@ -105,8 +92,11 @@ gc2000_piglit:
 
 gc7000_gles2:
   extends:
-    - .etnaviv-gc7000:arm64
+    - .baremetal-test-arm64
+    - .austriancoder-imx8mq-nitrogen:arm64
     - .etnaviv-manual-rules
   variables:
+    FLAKES_CHANNEL: "#etnaviv-ci"
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     DEQP_VER: gles2
+  timeout: 20m