diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 0296a7fdead..dd7962dda0a 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -1,6 +1,6 @@
 .etnaviv-armhf-test:
   extends:
-    - .baremetal-test
+    - .baremetal-test-armhf
     - .use-debian/arm_test
     - .etnaviv-rules
   script:
@@ -8,10 +8,8 @@
   variables:
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
     BM_KERNEL: /baremetal-files/zImage
-    BM_ROOTFS: /rootfs-armhf
     ETNA_MESA_DEBUG: nir
     FLAKES_CHANNEL: "#etnaviv-ci"
-    MINIO_ARTIFACT_NAME: mesa-armhf
   needs:
     - debian/arm_test
     - job: debian-armhf