diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index b289a607575..8399d702314 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -135,6 +135,7 @@
     BOOT_METHOD: depthcharge
     DEVICE_TYPE: acer-R721T-grunt
     DTB: ""
+    FARM: collabora
     FDO_CI_CONCURRENT: 3
     HWCI_FREQ_MAX: "true"
     HWCI_KERNEL_MODULES: amdgpu
@@ -148,6 +149,7 @@
     BOOT_METHOD: depthcharge
     DEVICE_TYPE: hp-14-db0003na-grunt
     DTB: ""
+    FARM: collabora
     FDO_CI_CONCURRENT: 3
     HWCI_FREQ_MAX: "true"
     HWCI_KERNEL_MODULES: amdgpu
@@ -161,6 +163,7 @@
     BOOT_METHOD: depthcharge
     DEVICE_TYPE: asus-CM1400CXA-dalboz
     DTB: ""
+    FARM: collabora
 #   FDO_CI_CONCURRENT: ?
     HWCI_FREQ_MAX: "true"
     HWCI_KERNEL_MODULES: amdgpu
@@ -173,6 +176,7 @@
     BOOT_METHOD: depthcharge
     DEVICE_TYPE: lenovo-TPad-C13-Yoga-zork
     DTB: ""
+    FARM: collabora
 #   FDO_CI_CONCURRENT: ?
     HWCI_FREQ_MAX: "true"
     HWCI_KERNEL_MODULES: amdgpu
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index 2d13073bd62..22f4ae6b34f 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -186,6 +186,7 @@
 .lava-acer-cb317-1h-c3z6-dedede:x86_64:
   variables:
     DEVICE_TYPE: acer-cb317-1h-c3z6-dedede
+    FARM: collabora
     FDO_CI_CONCURRENT: 3
     GPU_VERSION: iris-jsl
     HWCI_KERNEL_MODULES: i915
@@ -195,6 +196,7 @@
 .lava-asus-C523NA-A20057-coral:x86_64:
   variables:
     DEVICE_TYPE: asus-C523NA-A20057-coral
+    FARM: collabora
     FDO_CI_CONCURRENT: 5
     GPU_VERSION: iris-apl
     HWCI_KERNEL_MODULES: i915
@@ -204,6 +206,7 @@
 .lava-hp-x360-12b-ca0010nr-n4020-octopus:x86_64:
   variables:
     DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
+    FARM: collabora
     FDO_CI_CONCURRENT: 3
     GPU_VERSION: iris-glk
     HWCI_KERNEL_MODULES: i915
@@ -214,6 +217,7 @@
   variables:
     BOOT_METHOD: depthcharge
     DEVICE_TYPE: acer-cp514-2h-1130g7-volteer
+    FARM: collabora
     FDO_CI_CONCURRENT: 9
     GPU_VERSION: anv-tgl
     HWCI_KERNEL_MODULES: i915
@@ -224,6 +228,7 @@
   variables:
     BOOT_METHOD: depthcharge
     DEVICE_TYPE: acer-cp514-2h-1160g7-volteer
+    FARM: collabora
     FDO_CI_CONCURRENT: 9
     GPU_VERSION: anv-tgl
     HWCI_KERNEL_MODULES: i915
@@ -233,6 +238,7 @@
 .lava-asus-C433TA-AJ0005-rammus:x86_64:
   variables:
     DEVICE_TYPE: asus-C433TA-AJ0005-rammus
+    FARM: collabora
     FDO_CI_CONCURRENT: 5
     GPU_VERSION: iris-amly
     HWCI_KERNEL_MODULES: i915
@@ -242,6 +248,7 @@
 .lava-hp-x360-14-G1-sona:x86_64:
   variables:
     DEVICE_TYPE: hp-x360-14-G1-sona
+    FARM: collabora
     FDO_CI_CONCURRENT: 9
     GPU_VERSION: iris-kbl
     HWCI_KERNEL_MODULES: i915
@@ -251,6 +258,7 @@
 .lava-dell-latitude-5400-8665U-sarien:x86_64:
   variables:
     DEVICE_TYPE: dell-latitude-5400-8665U-sarien
+    FARM: collabora
     FDO_CI_CONCURRENT: 9
     GPU_VERSION: iris-whl
     HWCI_KERNEL_MODULES: i915
@@ -260,6 +268,7 @@
 .lava-asus-C436FA-Flip-hatch:x86_64:
   variables:
     DEVICE_TYPE: asus-C436FA-Flip-hatch
+    FARM: collabora
     FDO_CI_CONCURRENT: 9
     GPU_VERSION: iris-cml
     HWCI_KERNEL_MODULES: i915
diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 0fd15dd1ac3..6552f4b6645 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -103,6 +103,7 @@
   variables:
     DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
     DTB: $DEVICE_TYPE
+    FARM: collabora
     GPU_VERSION: panfrost-g52
 #   FDO_CI_CONCURRENT: ?
     RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
@@ -115,6 +116,7 @@
     DTB: $DEVICE_TYPE
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    FARM: collabora
     GPU_VERSION: panfrost-g72
 #   FDO_CI_CONCURRENT: ?
     RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
@@ -126,6 +128,7 @@
     DEVICE_TYPE: mt8192-asurada-spherion-r0
     DTB: $DEVICE_TYPE
 #   FDO_CI_CONCURRENT: ?
+    FARM: collabora
     GPU_VERSION: panfrost-g57
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0
@@ -138,6 +141,7 @@
     DRIVER_NAME: panfrost
     DTB: rk3288-veyron-jaq
     FDO_CI_CONCURRENT: 6
+    FARM: collabora
     GPU_VERSION: panfrost-t760
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
@@ -147,6 +151,7 @@
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     DTB: $DEVICE_TYPE
+    FARM: collabora
     GPU_VERSION: panfrost-t860
     DRIVER_NAME: panfrost
 #   FDO_CI_CONCURRENT: ?
@@ -159,6 +164,7 @@
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     DTB: sun50i-h6-pine-h64
+    FARM: collabora
     GPU_VERSION: panfrost-t720
     DEQP_SUITE: panfrost-t720
     FDO_CI_CONCURRENT: 6