diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9836763f8d9..44a29b30331 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1357,6 +1357,7 @@ debian-mingw32-x86_64:
   extends:
     - .baremetal-test
   variables:
+    BM_ROOTFS: /rootfs-armhf
     MINIO_ARTIFACT_NAME: mesa-armhf
 
 .baremetal-arm64-asan-test:
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 4f70ef1e1de..1bdc4e8874e 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -5,7 +5,6 @@
     - .use-debian/arm_test
   variables:
     BM_BOOTFS: /boot/raspberrypi_armhf
-    BM_ROOTFS: /rootfs-armhf
     GPU_VERSION: vc4-rpi3
     HWCI_KERNEL_MODULES: vc4
     FLAKES_CHANNEL: "#videocore-ci"
@@ -71,7 +70,6 @@ vc4-rpi3-piglit-quick_shader:armhf:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     BM_BOOTFS: /boot/raspberrypi_armhf
     BM_POE_TIMEOUT: 300
-    BM_ROOTFS: /rootfs-armhf
     FLAKES_CHANNEL: "#videocore-ci"
     GPU_VERSION: v3d-rpi4
     HWCI_KERNEL_MODULES: v3d,vc4