diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b9230147b3..d77f03b0139 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ variables:
   # Individual CI farm status, set to "offline" to disable jobs
   # running on a particular CI farm (ie. for outages, etc):
   FD_FARM: "online"
+  COLLABORA_FARM: "online"
 
 default:
   before_script:
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index ee96f3016f8..f674cc934dc 100755
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -28,6 +28,8 @@
       - results/
     exclude:
       - results/*.shader_cache
+  tags:
+    - $RUNNER_TAG
   after_script:
     - wget -q "https://${JOB_RESULTS_PATH}" -O- | tar -xz
 
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 7467b7e5a55..f48f95c0bfc 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -150,6 +150,8 @@
   rules:
     - if: '$FD_FARM == "offline"'
       when: never
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - *ignore_scheduled_pipelines
     - changes:
         *mesa_core_file_list
@@ -177,6 +179,8 @@
   rules:
     - if: '$FD_FARM == "offline"'
       when: never
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     # If the triggerer has access to the restricted traces and if it is pre-merge
     - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu)$/") &&
            ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
@@ -203,6 +207,8 @@
   rules:
     - if: '$FD_FARM == "offline"'
       when: never
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - *ignore_scheduled_pipelines
     # Run only on pre-merge pipelines from Marge
     - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
@@ -225,6 +231,8 @@
   stage: arm
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -251,6 +259,8 @@
   stage: arm
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -346,6 +356,8 @@
   stage: amd
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -378,6 +390,8 @@
   stage: amd
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -399,6 +413,8 @@
   stage: amd
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -452,6 +468,8 @@
   stage: intel
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -471,6 +489,8 @@
   stage: intel
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     # Run only on pre-merge pipelines from Marge
     - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
       when: never
@@ -489,6 +509,8 @@
   stage: intel
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index b0e2a62499a..35a75f867af 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -75,8 +75,7 @@ radv_stoney_vkcts:amd64:
     HWCI_FREQ_MAX: "true"
     VK_DRIVER: radeon
     DRIVER_NAME: radv
-  tags:
-    - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
+    RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
 
 .radv-fossils:
   extends:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 765eeb795fb..0524c6fc182 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -148,8 +148,7 @@ a618_vk:
     DTB: sc7180-trogdor-lazor-limozeen-nots
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
+    RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
 
 a618_vk_full:
   extends:
diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index 881eee8abf7..b2581fdaa1c 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -17,8 +17,7 @@
   variables:
     DEVICE_TYPE: asus-C523NA-A20057-coral
     GPU_VERSION: iris-apl
-  tags:
-    - mesa-ci-x86-64-lava-asus-C523NA-A20057-coral
+    RUNNER_TAG: mesa-ci-x86-64-lava-asus-C523NA-A20057-coral
 
 # 4 boards
 .iris-glk-test:
@@ -27,8 +26,7 @@
   variables:
     DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
     GPU_VERSION: iris-glk
-  tags:
-    - mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus
+    RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus
 
 # 5 boards, manual for now due to the GPU being occasionally stuck
 .iris-amly-test:
@@ -38,8 +36,7 @@
   variables:
     DEVICE_TYPE: asus-C433TA-AJ0005-rammus
     GPU_VERSION: iris-amly
-  tags:
-    - mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus
+    RUNNER_TAG: mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus
 
 # 7 boards
 .iris-kbl-test:
@@ -48,8 +45,7 @@
   variables:
     DEVICE_TYPE: hp-x360-14-G1-sona
     GPU_VERSION: iris-kbl
-  tags:
-    - mesa-ci-x86-64-lava-hp-x360-14-G1-sona
+    RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-14-G1-sona
 
 # 5 boards
 .iris-whl-test:
@@ -58,8 +54,7 @@
   variables:
     DEVICE_TYPE: dell-latitude-5400-8665U-sarien
     GPU_VERSION: iris-whl
-  tags:
-    - mesa-ci-x86-64-lava-dell-latitude-5400-8665U-sarien
+    RUNNER_TAG: mesa-ci-x86-64-lava-dell-latitude-5400-8665U-sarien
 
 # 5 boards
 .iris-cml-test:
@@ -68,8 +63,7 @@
   variables:
     DEVICE_TYPE: asus-C436FA-Flip-hatch
     GPU_VERSION: iris-cml
-  tags:
-    - mesa-ci-x86-64-lava-asus-C436FA-flip-hatch
+    RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch
 
 iris-apl-deqp:
   extends:
diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml
index ef679f0ddb5..148c2a50427 100644
--- a/src/gallium/drivers/lima/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml
@@ -10,6 +10,4 @@
     FDO_CI_CONCURRENT: 4
     DEQP_EXPECTED_RENDERER: Mali450
     VISIBILITY_GROUP: "mesa-ci"
-
-  tags:
-    - mesa-ci-x86-64-lava-lima
+    RUNNER_TAG: mesa-ci-x86-64-lava-lima
diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
index 86f69d05c18..af50d8038cd 100644
--- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
@@ -12,8 +12,7 @@
     FDO_CI_CONCURRENT: 4
     DEQP_EXPECTED_RENDERER: STONEY
     HWCI_FREQ_MAX: "true"
-  tags:
-    - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
+    RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
 
 radeonsi-stoney-gl:amd64:
   extends:
@@ -31,8 +30,7 @@ radeonsi-stoney-traces:amd64:
     EGL_PLATFORM: surfaceless
     PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml"
     PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
-  tags:
-    - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
+    RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
 
 radeonsi-stoney-piglit-gl:amd64:
   extends:
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index 2d24485e9a4..9bd29012d7c 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -18,8 +18,7 @@
     DEVICE_TYPE: asus-cx9400-volteer
     GPU_VERSION: anv-tgl
     FDO_CI_CONCURRENT: 8
-  tags:
-    - mesa-ci-x86-64-lava-asus-cx9400-volteer
+    RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer
 
 anv-tgl-vk:
   extends:
diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 6d57d3cfb81..dc0194de5c0 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -15,8 +15,7 @@ panfrost-t720-gles2:arm64:
     GPU_VERSION: panfrost-t720
     DEQP_SUITE: panfrost-t720
     FDO_CI_CONCURRENT: 6
-  tags:
-    - mesa-ci-x86-64-lava-sun50i-h6-pine-h64
+    RUNNER_TAG: mesa-ci-x86-64-lava-sun50i-h6-pine-h64
 
 panfrost-t760-gles2:armhf:
   extends:
@@ -31,8 +30,7 @@ panfrost-t760-gles2:armhf:
     KERNEL_IMAGE_TYPE: ""
     DEQP_SUITE: panfrost-t760
     FDO_CI_CONCURRENT: 6
-  tags:
-    - mesa-ci-x86-64-lava-rk3288-veyron-jaq
+    RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
 
 panfrost-t760-traces:armhf:
   extends:
@@ -53,8 +51,7 @@ panfrost-t760-traces:armhf:
     EGL_PLATFORM: surfaceless
     PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
     PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image"
-  tags:
-    - mesa-ci-x86-64-lava-rk3288-veyron-jaq
+    RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
 
 .lava-rk3399-gru-kevin:
   extends:
@@ -67,8 +64,7 @@ panfrost-t760-traces:armhf:
     DRIVER_NAME: panfrost
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-x86-64-lava-rk3399-gru-kevin
+    RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
 
 panfrost-t860-gl:arm64:
   parallel: 3
@@ -100,8 +96,7 @@ panfrost-t860-traces:arm64:
     DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
     DTB: $DEVICE_TYPE
     GPU_VERSION: panfrost-g52
-  tags:
-    - mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
+    RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
 
 panfrost-g52-gl:arm64:
   parallel: 3
@@ -144,8 +139,7 @@ panfrost-g52-piglit-gl:arm64:
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
     GPU_VERSION: panfrost-g72
-  tags:
-    - mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
+    RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
 
 panfrost-g72-gl:arm64:
   parallel: 3
@@ -166,5 +160,4 @@ panfrost-g72-gl:arm64:
     GPU_VERSION: panfrost-t820
     FDO_CI_CONCURRENT: 6
     DEQP_SUITE: panfrost-t720
-  tags:
-    - mesa-ci-aarch64-lava-baylibre
+    RUNNER_TAG: mesa-ci-aarch64-lava-baylibre