diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
index 50f8abc0af0..092a24a110b 100644
--- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
@@ -1,4 +1,4 @@
-.radeonsi-stoney-gles2:amd64:
+radeonsi-stoney-gles2:amd64:
   extends:
     - .lava-test:amd64
     - .radeonsi-rules
@@ -14,23 +14,19 @@
 
 .radeonsi-stoney-gles3:amd64:
   extends:
-    - .radeonsi-stoney-gles2:amd64
+    - radeonsi-stoney-gles2:amd64
+  parallel: 2
   variables:
     DEQP_VERSION: gles3
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 4
-  tags:
-    - mesa-ci-aarch64-lava-collabora
+    ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY DEQP_FRACTION=2"
 
 radeonsi-stoney-gles31:amd64:
   extends:
-    - .radeonsi-stoney-gles2:amd64
+    - radeonsi-stoney-gles2:amd64
+  parallel: 2
   variables:
     DEQP_VERSION: gles31
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 5
-  tags:
-    - mesa-ci-aarch64-lava-collabora
+    ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY DEQP_FRACTION=2"
 
 radeonsi-stoney-traces:amd64:
   extends: