diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 76ff442b11a..0454b4efc81 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -193,6 +193,18 @@
     # Force fixed 6.6 kernel, we're not reliably getting a GPU on 6.13
     EXTERNAL_KERNEL_TAG: "v6.6.21-mesa-f8ea"
 
+# Status: https://lava.collabora.dev/scheduler/device_type/mt8195-cherry-tomato-r2
+.lava-mt8195-cherry-tomato-r2:arm64:
+  variables:
+    BOOT_METHOD: depthcharge
+    DEVICE_TYPE: mt8195-cherry-tomato-r2
+    DTB: $DEVICE_TYPE
+    FDO_CI_CONCURRENT: 8
+    FARM: collabora
+    GPU_VERSION: panfrost-g57
+    KERNEL_IMAGE_TYPE: ""
+    RUNNER_TAG: mesa-ci-x86-64-lava-mt8195-cherry-tomato-r2
+
 .lava-rk3288-veyron-jaq:arm32:
   variables:
     BOOT_METHOD: depthcharge
@@ -375,10 +387,12 @@ panfrost-g57-gl:arm64:
     - .lava-test-deqp:arm64
     - .panfrost-bifrost-gl-rules
     - .panfrost-test
-    - .lava-mt8192-asurada-spherion-r0:arm64
-  parallel: 6
+    - .lava-mt8195-cherry-tomato-r2:arm64
+  parallel: 3
   variables:
     DEQP_SUITE: panfrost-g57
+    # Oversubscribing by one thread helps deqp, but hurts piglit
+    FDO_CI_CONCURRENT: 9
 
 panfrost-g610-gl:arm64:
   parallel: 2