diff --git a/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt b/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
index 0b88289ef5a..af245f719c6 100644
--- a/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
+++ b/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
@@ -1,3 +1,4 @@
+dEQP-VK.api.external.fence.opaque_fd.reset_permanent
 dEQP-VK.synchronization.op.single_queue.binary_semaphore.write_copy_buffer_read_ssbo_compute.buffer_16384
 dEQP-VK.synchronization.op.single_queue.binary_semaphore.write_copy_buffer_read_ssbo_compute.buffer_262144
 dEQP-VK.synchronization.op.single_queue.binary_semaphore.write_copy_buffer_read_ssbo_compute_indirect.buffer_16384
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index f47a4c61007..29dd1ad275e 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -151,29 +151,29 @@ v3d-rpi4-piglit:armhf:
     PIGLIT_PLATFORM: mixed_glx_egl
     PIGLIT_PROFILES: all
 
-v3dv-rpi4-vk:armhf:
+v3dv-rpi4-vk:arm64:
   extends:
-    - .baremetal-test-armhf
+    - .baremetal-test
     - .use-arm_test
     - .v3dv-rules
   parallel: 6
   variables:
     BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
-    BM_BOOTFS: /boot/raspberrypi_armhf
+    BM_BOOTFS: /boot/raspberrypi_arm64
     BM_KERNEL_MODULES: v3d,vc4
     BM_POE_TIMEOUT: 300
-    BM_ROOTFS: /rootfs-armhf
-    CPU: arm7hlf
+    BM_ROOTFS: /rootfs-arm64
     DEQP_EXPECTED_RENDERER: "V3D 4.2"
     DEQP_FRACTION: 7
     DEQP_VER: vk
     GPU_VERSION: v3dv-rpi4
-    VK_CPU: arm7hlf
+    MINIO_ARTIFACT_NAME: mesa-arm64
     VK_DRIVER: broadcom
   script:
     - ./install/bare-metal/poe-powered.sh
   needs:
     - arm_test
-    - meson-armhf
+    - job: meson-arm64
+      artifacts: false
   tags:
     - igalia-rpi4