diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index d927d438a815841982b3b30e953c8cb497173664..cf0c55187edbcbd7df25137cd03c0da56899fdf5 100644
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -11,7 +11,9 @@ timeouts:
     power-off:
       seconds: 30
 priority: 75
-visibility: "Collabora+fdo"
+visibility:
+    group:
+      - "Collabora+fdo"
 {% if tags %}
 {% set lavatags = tags.split(',') %}
 tags:
diff --git a/.gitlab-ci/lava-piglit.yml.jinja2 b/.gitlab-ci/lava-piglit.yml.jinja2
index 3f12da5bc8b0687e07025fd013dd85ff2a93529b..07ad5a7bc4a293759c90ebaaa737e69b657e001c 100644
--- a/.gitlab-ci/lava-piglit.yml.jinja2
+++ b/.gitlab-ci/lava-piglit.yml.jinja2
@@ -11,7 +11,9 @@ timeouts:
     power-off:
       seconds: 30
 priority: 75
-visibility: "Collabora+fdo"
+visibility:
+    group:
+      - "Collabora+fdo"
 {% if tags %}
 {% set lavatags = tags.split(',') %}
 tags:
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..02aff76e16e9d4b044daf4658a663c396b73d8d1
--- /dev/null
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt
@@ -0,0 +1 @@
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16
diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
index 1c191c246bd78581aa76eea7649a09cc0dc6d141..6a49e6c7fb13bbf1773fa8326daf646d0e007ecc 100644
--- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
@@ -1,4 +1,4 @@
-.panfrost-t720-gles2:arm64:
+panfrost-t720-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .panfrost-rules
@@ -10,7 +10,7 @@
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t760-gles2:armhf:
+panfrost-t760-gles2:armhf:
   extends:
     - .lava-test:armhf
     - .panfrost-rules
@@ -24,7 +24,7 @@
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t760-traces:armhf:
+panfrost-t760-traces:armhf:
   extends:
     - .lava-piglit-traces:armhf
     - .panfrost-rules
@@ -52,14 +52,14 @@
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t860-gles2:arm64:
+panfrost-t860-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .lava-rk3399-gru-kevin
   variables:
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860"
 
-.panfrost-t860-gles3:arm64:
+panfrost-t860-gles3:arm64:
   parallel: 2
   extends:
     - .lava-test:arm64
@@ -68,7 +68,16 @@
     DEQP_VERSION: gles3
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860"
 
-.panfrost-t860-traces:arm64:
+panfrost-t860-gles31:arm64:
+  extends:
+    - .lava-test:arm64
+    - .lava-rk3399-gru-kevin
+  variables:
+    DEQP_VERSION: gles31
+    DEQP_FRACTION: 4
+    ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GLSL_VERSION_OVERRIDE=310 DEQP_PARALLEL=1 DEQP_EXPECTED_RENDERER=T860"
+
+panfrost-t860-traces:arm64:
   extends:
     - .lava-piglit-traces:arm64
     - .lava-rk3399-gru-kevin
@@ -85,14 +94,14 @@
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-g52-gles2:arm64:
+panfrost-g52-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .lava-meson-g12b-a311d-khadas-vim3
   variables:
     ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52"
 
-.panfrost-g52-gles3:arm64:
+panfrost-g52-gles3:arm64:
   extends:
     - .lava-test:arm64
     - .lava-meson-g12b-a311d-khadas-vim3
diff --git a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
index d72f598e2995fb786c342285c6b9f63f9e750f3d..daa4ab664b70c60f1b2019ebdf2fc449243a3396 100644
--- a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
+++ b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
@@ -53,7 +53,8 @@ traces:
       - device: gl-panfrost-t860
         checksum: f83da726bff354684a576effa74ef681
       - device: gl-panfrost-t760
-        checksum: a41f53e9318cbd32c27b48d304df1ea6
+        # Wrong rendering, many elements are missing
+        checksum: 67db7302b28cb8e3e217cc79b672af79
   - path: 0ad/0ad.trace
     expectations:
       - device: gl-panfrost-t860
diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
index b9bd2b547a1a55b809f7ecc6888d79870c2cc3e8..a17f4d46ab3541587903ea34bd182c6b61941d2d 100644
--- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
@@ -22,7 +22,7 @@
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.radeonsi-stoney-gles31:amd64:
+radeonsi-stoney-gles31:amd64:
   extends:
     - .radeonsi-stoney-gles2:amd64
   variables:
@@ -32,7 +32,7 @@
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.radeonsi-stoney-traces:amd64:
+radeonsi-stoney-traces:amd64:
   extends:
     - .lava-piglit-traces:amd64
     - .radeonsi-rules