diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 1f162bd83bb..a1affb61376 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -107,16 +107,16 @@ panfrost-t860-test:arm64:
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t820-test:arm64:
+panfrost-t820-gles2:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: meson-gxm-khadas-vim2
     GPU_VERSION: panfrost-t820
     LAVA_TAGS: panfrost
   tags:
-    - lava-meson-gxm-khadas-vim2
+    - mesa-ci-aarch64-lava-baylibre
 
-.lima-mali400-test:armhf:
+lima-mali400-test:armhf:
   parallel: 2
   extends: .lava-test:armhf
   variables:
@@ -124,13 +124,13 @@ panfrost-t860-test:arm64:
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=3"
   tags:
-    - lava-sun8i-h3-libretech-all-h3-cc
+    - mesa-ci-aarch64-lava-baylibre
 
-.lima-mali450-test:arm64:
+lima-mali450-test:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: meson-gxl-s905x-libretech-cc
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=6"
   tags:
-    - lava-meson-gxl-s905x-libretech-cc
+    - mesa-ci-aarch64-lava-baylibre