diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml
index 3ca2dc1dd49..394dfd43e1c 100644
--- a/src/panfrost/ci/gitlab-ci-inc.yml
+++ b/src/panfrost/ci/gitlab-ci-inc.yml
@@ -235,17 +235,17 @@
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
 
-# Status: https://lava.collabora.dev/scheduler/device_type/rk3399-gru-kevin
-.lava-rk3399-gru-kevin:arm64:
+# Status: https://lava.collabora.dev/scheduler/device_type/rk3399-rock-pi-4b
+.lava-rk3399-rock-pi-4b:arm64:
   variables:
-    DEVICE_TYPE: rk3399-gru-kevin
+    DEVICE_TYPE: rk3399-rock-pi-4b
     DTB: $DEVICE_TYPE
     FARM: collabora
     GPU_VERSION: panfrost-t860
 #   FDO_CI_CONCURRENT: ?
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
+    BOOT_METHOD: u-boot
+    KERNEL_IMAGE_TYPE: "image"
+    RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-rock-pi-4b
 
 # Status: https://lava.collabora.dev/scheduler/device_type/rk3588-rock-5b
 .lava-rk3588-rock-5b:arm64:
diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 4fed10854e6..e2d069d705a 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -34,7 +34,7 @@ panfrost-t860-cl:arm64:
     - .panfrost-midgard-manual-rules
     - .panfrost-test
     - .test-piglit
-    - .lava-rk3399-gru-kevin:arm64
+    - .lava-rk3399-rock-pi-4b:arm64
   rules:
     - !reference [.panfrost-midgard-manual-rules, rules]
     - !reference [.rusticl-manual-rules, rules]
@@ -48,7 +48,7 @@ panfrost-t860-gl:arm64:
     - .lava-arm64-test-gl
     - .panfrost-midgard-manual-rules
     - .panfrost-test
-    - .lava-rk3399-gru-kevin:arm64
+    - .lava-rk3399-rock-pi-4b:arm64
   variables:
     FDO_CI_CONCURRENT: 6
     DEQP_SUITE: panfrost-t860
@@ -58,7 +58,7 @@ panfrost-t860-egl:arm64:
     - .lava-arm64-test-gl
     - .panfrost-midgard-manual-rules
     - .panfrost-test
-    - .lava-rk3399-gru-kevin:arm64
+    - .lava-rk3399-rock-pi-4b:arm64
   variables:
     HWCI_START_WESTON: 1
     DEQP_SUITE: panfrost-t860-egl
@@ -68,7 +68,7 @@ panfrost-t860-traces:arm64:
     - .lava-arm64-piglit-traces
     - .panfrost-midgard-manual-rules
     - .panfrost-test
-    - .lava-rk3399-gru-kevin:arm64
+    - .lava-rk3399-rock-pi-4b:arm64
     - .panfrost-traces
 
 panfrost-g52-gl:arm64: