diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml
index 51f13ade5bd..f6a8ea5b070 100644
--- a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml
@@ -41,33 +41,31 @@
     - .nouveau-rules
   variables:
     FLAKES_CHANNEL: "#nouveau-ci"
-    # We package nouveau as a module so that we can load it after the firmware is
-    # available on NFS.
-    HWCI_KERNEL_MODULES: tegra-drm,nouveau
   timeout: 20m
-  script:
-    - ./install/bare-metal/poe-powered.sh
 
-.gk20a-test:
-  extends:
-    - .baremetal-test-arm32
-    - .nouveau-bm-test
+# 6 devices (2023-xx-xx)
+.anholt-tegra124-jetson-tk1:arm32:
   variables:
     BM_BOOTFS: /baremetal-files/jetson-tk1/
     BM_CMDLINE: "console=ttyS0,115200n8 rw nfsrootdebug init=/init ip=dhcp root=/dev/nfs nfsroot=,tcp,nfsvers=4.2"
     BM_DTB: tegra124-jetson-tk1
     BM_KERNEL: zImage
+    DEVICE_TYPE: anholt-jetson
+    FARM: anholt
     GPU_VERSION: nouveau-gk20a
     # 4 CPUs, but spawn a couple extra threads to make sure they stay busy while
     # some are waiting for the GPU.
     FDO_CI_CONCURRENT: 6
+    # We package nouveau as a module so that we can load it after the firmware is
+    # available on NFS.
+    HWCI_KERNEL_MODULES: tegra-drm,nouveau
+  script:
+    - ./install/bare-metal/poe-powered.sh
   tags:
     - anholt-nouveau-jetson-tk1
 
-.gm20b-test:
-  extends:
-    - .baremetal-test-arm64
-    - .nouveau-bm-test
+# 0 devices (2023-02-08)
+.google-tegra210-p3450-0000:arm64:
   variables:
     BM_BOOTFS: /baremetal-files/jetson-nano/
     BM_CMDLINE: "console=ttyS0,115200n8 rw nfsrootdebug init=/init nfsroot=,tcp,nfsvers=4.2"
@@ -77,8 +75,10 @@
     # 4 CPUs, but spawn a couple extra threads to make sure they stay busy while
     # some are waiting for the GPU.
     FDO_CI_CONCURRENT: 6
+    # We package nouveau as a module so that we can load it after the firmware is
+    # available on NFS.
+    HWCI_KERNEL_MODULES: tegra-drm,nouveau
   script:
     - ./install/bare-metal/poe-powered.sh
   tags:
     - google-nouveau-jetson-nano
-
diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml
index 673d77eaee2..6bb11fc494a 100644
--- a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml
@@ -1,22 +1,23 @@
 include:
   - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml'
 
-# 6 Jetson TK1 boards at anholt's house.
 gk20a-gles:
   extends:
-    - .gk20a-test
+    - .baremetal-test-arm32
+    - .nouveau-bm-test
+    - .anholt-tegra124-jetson-tk1:arm32
   parallel: 4
   timeout: 30m
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     DEQP_SUITE: nouveau-gk20a
-    FARM : anholt
-    DEVICE_TYPE: anholt-jetson
 
 # Single Jetson Nano board at anholt's house.
 .gm20b-gles-full:
   extends:
-    - .gm20b-test
+    - .baremetal-test-arm64
+    - .nouveau-bm-test
+    - .google-tegra210-p3450-0000:arm64
     - .nouveau-manual-rules
   timeout: 2h
   variables: