diff --git a/config/jobs-chromeos.yaml b/config/jobs-chromeos.yaml
index e083ced58..0c6d87d10 100644
--- a/config/jobs-chromeos.yaml
+++ b/config/jobs-chromeos.yaml
@@ -58,6 +58,7 @@ _anchors:
       tree:
       - '!android'
       - '!chromiumos'
+      - '!cip'
       - '!omap'
 
   kbuild-gcc-14-x86-chromeos: &kbuild-gcc-14-x86-chromeos-job
@@ -77,6 +78,7 @@ _anchors:
       tree:
       - '!android'
       - '!chromiumos'
+      - '!cip'
 
   min-5_4-rules: &min-5_4-rules
     min_version:
@@ -664,6 +666,7 @@ jobs:
       tree:
         - '!android'
         - '!chromiumos'
+        - '!cip'
         - '!media-committers'
 
   kbuild-gcc-14-arm64-chromebook-media-committers:
diff --git a/config/jobs-cip.yaml b/config/jobs-cip.yaml
index 00b8a11b9..f70f94d04 100644
--- a/config/jobs-cip.yaml
+++ b/config/jobs-cip.yaml
@@ -1,12 +1,12 @@
 _anchors:
-  baseline-job: &baseline-job
+  baseline-job-cip: &baseline-job-cip
     template: baseline.jinja2
     kind: job
     kcidb_test_suite: boot
     params:
       ramdisk: 'http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/20230703.0/{brarch}/rootfs.cpio.gz'
 
-  baseline-nfs-job: &baseline-nfs-job
+  baseline-nfs-job-cip: &baseline-nfs-job-cip
     template: baseline-nfs.jinja2
     kind: job
     kcidb_test_suite: boot.nfs
@@ -14,16 +14,12 @@ _anchors:
       boot_commands: nfs
       nfsroot: http://storage.kernelci.org/images/rootfs/debian/bookworm/20240313.0/{debarch}
 
-  kbuild-job: &kbuild-job
+  kbuild-job-cip: &kbuild-job-cip
     template: kbuild.jinja2
     kind: kbuild
-    rules:
-      tree:
-      - '!android'
-      - '!chromiumos'
 
   kbuild-gcc-14-arm: &kbuild-gcc-14-arm-job
-    <<: *kbuild-job
+    <<: *kbuild-job-cip
     image: ghcr.io/kernelci/{image_prefix}gcc-14:arm-kselftest-kernelci
     params: &kbuild-gcc-14-arm-params
       arch: arm
@@ -32,7 +28,7 @@ _anchors:
       defconfig: multi_v7_defconfig
 
   kbuild-gcc-14-arm64: &kbuild-gcc-14-arm64-job
-    <<: *kbuild-job
+    <<: *kbuild-job-cip
     image: ghcr.io/kernelci/{image_prefix}gcc-14:arm64-kselftest-kernelci
     params: &kbuild-gcc-14-arm64-params
       arch: arm64
@@ -44,7 +40,7 @@ _anchors:
         - 'kselftest'
 
   kbuild-gcc-14-x86-job-cip: &kbuild-gcc-14-x86-job-cip
-    <<: *kbuild-job
+    <<: *kbuild-job-cip
     image: ghcr.io/kernelci/{image_prefix}gcc-14:x86-kselftest-kernelci
     params: &kbuild-gcc-14-x86-params
       arch: x86_64
@@ -55,10 +51,10 @@ _anchors:
 
 jobs:
 # start of CIP arm64 configuration for boot tests
-  job-gcc-14-arm64-612-cip: *baseline-job
-  job-gcc-14-arm64-61-cip: *baseline-job
-  job-gcc-14-arm64-510-cip: *baseline-job
-  job-gcc-14-arm64-419-cip: *baseline-job
+  job-gcc-14-arm64-612-cip: *baseline-job-cip
+  job-gcc-14-arm64-61-cip: *baseline-job-cip
+  job-gcc-14-arm64-510-cip: *baseline-job-cip
+  job-gcc-14-arm64-419-cip: *baseline-job-cip
 
   kbuild-gcc-14-arm64-612-cip:
     <<: *kbuild-gcc-14-arm64-job
@@ -125,11 +121,11 @@ jobs:
         - 'cip:linux-4.19.y-cip'
 
 # start of CIP arm configuration for boot tests
-  job-gcc-14-arm-612-cip: *baseline-nfs-job
-  job-gcc-14-arm-61-cip: *baseline-nfs-job
-  job-gcc-14-arm-510-cip: *baseline-nfs-job
-  job-gcc-14-arm-419-cip: *baseline-nfs-job
-  job-gcc-14-arm-44-cip: *baseline-nfs-job
+  job-gcc-14-arm-612-cip: *baseline-nfs-job-cip
+  job-gcc-14-arm-61-cip: *baseline-nfs-job-cip
+  job-gcc-14-arm-510-cip: *baseline-nfs-job-cip
+  job-gcc-14-arm-419-cip: *baseline-nfs-job-cip
+  job-gcc-14-arm-44-cip: *baseline-nfs-job-cip
 
   kbuild-gcc-14-arm-612-cip:
     <<: *kbuild-gcc-14-arm-job
@@ -216,11 +212,11 @@ jobs:
         - 'cip:linux-4.4.y-cip'
 
 # start of CIP x86_64 configuration for boot tests
-  job-gcc-14-x86-612-cip: *baseline-nfs-job
-  job-gcc-14-x86-61-cip: *baseline-nfs-job
-  job-gcc-14-x86-510-cip: *baseline-nfs-job
-  job-gcc-14-x86-419-cip: *baseline-nfs-job
-  job-gcc-14-x86-44-cip: *baseline-nfs-job
+  job-gcc-14-x86-612-cip: *baseline-nfs-job-cip
+  job-gcc-14-x86-61-cip: *baseline-nfs-job-cip
+  job-gcc-14-x86-510-cip: *baseline-nfs-job-cip
+  job-gcc-14-x86-419-cip: *baseline-nfs-job-cip
+  job-gcc-14-x86-44-cip: *baseline-nfs-job-cip
 
   kbuild-gcc-14-x86-612-cip:
     <<: *kbuild-gcc-14-x86-job-cip
diff --git a/config/jobs.yaml b/config/jobs.yaml
index 076ac4c13..f20cf95ac 100644
--- a/config/jobs.yaml
+++ b/config/jobs.yaml
@@ -30,6 +30,7 @@ _anchors:
       tree:
       - '!android'
       - '!chromiumos'
+      - '!cip'
 
   kbuild-clang-21-arm64-job: &kbuild-clang-21-arm64-job
     <<: *kbuild-job
@@ -104,7 +105,6 @@ _anchors:
     - 'amlogic'
     - 'ardb'
     - 'arnd'
-    - 'cip'
     - 'clk'
     - 'efi'
     - 'khilman'
@@ -976,8 +976,9 @@ jobs:
         - 'kselftest'
     rules:
       tree:
-      - '!omap'
       - '!chromiumos'
+      - '!cip'
+      - '!omap'
 
   # Default config and build only job
   kbuild-gcc-14-arm64-build-only:
@@ -1007,8 +1008,9 @@ jobs:
         - lab-setup
     rules:
       tree:
-      - '!omap'
       - '!chromiumos'
+      - '!cip'
+      - '!omap'
 
   kbuild-gcc-14-arm64-dtbscheck:
     <<: *kbuild-gcc-14-arm64-job
@@ -1028,8 +1030,9 @@ jobs:
     rules:
       <<: *kbuild-kselftest-rules
       tree:
-      - '!omap'
       - '!chromiumos'
+      - '!cip'
+      - '!omap'
 
   kbuild-gcc-14-arm64-mainline: &kbuild-gcc-14-arm64-mainline-job
     <<: *kbuild-gcc-14-arm64-job
@@ -1065,8 +1068,9 @@ jobs:
         - 'tinyconfig'
     rules:
       tree:
-      - '!omap'
       - '!chromiumos'
+      - '!cip'
+      - '!omap'
 
   kbuild-gcc-14-arm64-mfd:
     <<: *kbuild-gcc-14-arm64-job
@@ -1361,8 +1365,9 @@ jobs:
         - 'kselftest'
     rules:
       tree:
-      - '!omap'
       - '!chromiumos'
+      - '!cip'
+      - '!omap'
 
   kbuild-gcc-14-x86-allnoconfig:
     <<: *kbuild-gcc-14-x86-job
@@ -1413,6 +1418,7 @@ jobs:
     rules:
       tree:
       - '!android'
+      - '!cip'
       - '!chromiumos'
 
   kbuild-gcc-14-x86-kselftest:
@@ -1979,6 +1985,7 @@ jobs:
     rules:
       tree:
       - '!chromiumos'
+      - '!cip'
 
   kunit-x86_64:
     <<: *kunit-job
@@ -1986,8 +1993,9 @@ jobs:
       arch: x86_64
     rules:
       tree:
-        - '!omap'
         - '!chromiumos'
+        - '!cip'
+        - '!omap'
 
   kvm-unit-tests:
     <<: *kvm-unit-tests-job
diff --git a/config/scheduler-cip.yaml b/config/scheduler-cip.yaml
index 00eca743d..c9dc0e44f 100644
--- a/config/scheduler-cip.yaml
+++ b/config/scheduler-cip.yaml
@@ -24,67 +24,41 @@ scheduler:
     event: &kbuild-gcc-14-arm64-node-event
       <<: *node-event-kbuild
       name: kbuild-gcc-14-arm64
-    runtime: &lava-collabora-runtime
+    runtime: &lava-cip-runtime
       type: lava
-      name: lava-collabora
-    platforms: &collabora-arm64-platforms
-      - bcm2711-rpi-4-b
-      - meson-g12b-a311d-khadas-vim3
-      - mt8365-genio-350-evk
-      - mt8390-genio-700-evk
-      - mt8395-genio-1200-evk
-      - rk3399-gru-kevin
-      - rk3399-rock-pi-4b
-      - rk3588-rock-5b
-      - sun50i-h6-pine-h64
+      name: lava-cip
+    platforms: &cip-arm64-platforms
+      - qemu-arm64
+      - r8a774a1-hihope-rzg2m-ex
+      - zynqmp-zcu102
 
   - job: job-gcc-14-arm64-612-cip
     event:
       <<: *kbuild-gcc-14-arm64-node-event
       name: kbuild-gcc-14-arm64-612-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu-arm64
-      - r8a774a1-hihope-rzg2m-ex
-      - zynqmp-zcu102
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm64-platforms
 
   - job: job-gcc-14-arm64-61-cip
     event:
       <<: *kbuild-gcc-14-arm64-node-event
       name: kbuild-gcc-14-arm64-61-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu-arm64
-      - r8a774a1-hihope-rzg2m-ex
-      - zynqmp-zcu102
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm64-platforms
 
   - job: job-gcc-14-arm64-510-cip
     event:
       <<: *kbuild-gcc-14-arm64-node-event
       name: kbuild-gcc-14-arm64-510-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu-arm64
-      - r8a774a1-hihope-rzg2m-ex
-      - zynqmp-zcu102
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm64-platforms
 
   - job: job-gcc-14-arm64-419-cip
     event:
       <<: *kbuild-gcc-14-arm64-node-event
       name: kbuild-gcc-14-arm64-419-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu-arm64
-      - r8a774a1-hihope-rzg2m-ex
-      - zynqmp-zcu102
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm64-platforms
 
   - job: kbuild-gcc-14-arm64-612-cip
     <<: *build-k8s-all
@@ -103,72 +77,46 @@ scheduler:
     event: &kbuild-gcc-14-arm-node-event
       <<: *node-event-kbuild
       name: kbuild-gcc-14-arm
-    runtime: *lava-collabora-runtime
-    platforms: &collabora-arm-platforms
-      - imx6q-sabrelite
-      - odroid-xu3
-      - rk3288-rock2-square
-      - rk3288-veyron-jaq
+    runtime: *lava-cip-runtime
+    platforms: &cip-arm-platforms
+      - beaglebone-black
+      - de0-nano-soc
+      - qemu-arm
+      - r8a7743-iwg20d-q7
 
   - job: job-gcc-14-arm-612-cip
     event:
       <<: *kbuild-gcc-14-arm-node-event
       name: kbuild-gcc-14-arm-612-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - beaglebone-black
-      - de0-nano-soc
-      - qemu-arm
-      - r8a7743-iwg20d-q7
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm-platforms
 
   - job: job-gcc-14-arm-61-cip
     event:
       <<: *kbuild-gcc-14-arm-node-event
       name: kbuild-gcc-14-arm-61-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - beaglebone-black
-      - de0-nano-soc
-      - qemu-arm
-      - r8a7743-iwg20d-q7
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm-platforms
 
   - job: job-gcc-14-arm-510-cip
     event:
       <<: *kbuild-gcc-14-arm-node-event
       name: kbuild-gcc-14-arm-510-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - beaglebone-black
-      - de0-nano-soc
-      - qemu-arm
-      - r8a7743-iwg20d-q7
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm-platforms
 
   - job: job-gcc-14-arm-419-cip
     event:
       <<: *kbuild-gcc-14-arm-node-event
       name: kbuild-gcc-14-arm-419-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - beaglebone-black
-      - de0-nano-soc
-      - qemu-arm
-      - r8a7743-iwg20d-q7
+    runtime: *lava-cip-runtime
+    platforms: *cip-arm-platforms
 
   - job: job-gcc-14-arm-44-cip
     event:
       <<: *kbuild-gcc-14-arm-node-event
       name: kbuild-gcc-14-arm-44-cip
-    runtime:
-      type: lava
-      name: lava-cip
+    runtime: *lava-cip-runtime
     platforms:
       - beaglebone-black
       - qemu-arm
@@ -194,10 +142,8 @@ scheduler:
     event: &kbuild-gcc-14-x86-node-event
       <<: *node-event-kbuild
       name: kbuild-gcc-14-x86
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
+    runtime: *lava-cip-runtime
+    platforms: &cip-x86-platforms
       - qemu
       - x86-openblocks-iot-vx2
       - x86-siemens-mcom
@@ -208,61 +154,35 @@ scheduler:
     event:
       <<: *kbuild-gcc-14-x86-node-event
       name: kbuild-gcc-14-x86-612-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu
-      - x86-openblocks-iot-vx2
-      - x86-siemens-mcom
-      - x86-simatic-ipc227e
+    runtime: *lava-cip-runtime
+    platforms: *cip-x86-platforms
 
   - job: job-gcc-14-x86-61-cip
     event:
       <<: *kbuild-gcc-14-x86-node-event
       name: kbuild-gcc-14-x86-61-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu
-      - x86-openblocks-iot-vx2
-      - x86-siemens-mcom
-      - x86-simatic-ipc227e
+    runtime: *lava-cip-runtime
+    platforms: *cip-x86-platforms
 
   - job: job-gcc-14-x86-510-cip
     event:
       <<: *kbuild-gcc-14-x86-node-event
       name: kbuild-gcc-14-x86-510-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu
-      - x86-openblocks-iot-vx2
-      - x86-siemens-mcom
-      - x86-simatic-ipc227e
+    runtime: *lava-cip-runtime
+    platforms: *cip-x86-platforms
 
   - job: job-gcc-14-x86-419-cip
     event:
       <<: *kbuild-gcc-14-x86-node-event
       name: kbuild-gcc-14-x86-419-cip
-    runtime:
-      type: lava
-      name: lava-cip
-    platforms:
-      - qemu
-      - x86-openblocks-iot-vx2
-      - x86-siemens-mcom
-      - x86-simatic-ipc227e
+    runtime: *lava-cip-runtime
+    platforms: *cip-x86-platforms
 
   - job: job-gcc-14-x86-44-cip
     event:
       <<: *kbuild-gcc-14-x86-node-event
       name: kbuild-gcc-14-x86-44-cip
-    runtime:
-      type: lava
-      name: lava-cip
+    runtime: *lava-cip-runtime
     platforms:
       - qemu