diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index c0b5f6a7279..132a6c85bc1 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -277,141 +277,6 @@
       - src/gallium/frontends/rusticl/**/*
       when: on_success
 
-.i915g-rules:
-  stage: intel
-  rules:
-    - !reference [.gl-rules, rules]
-    - changes: &i915g_file_list
-      - src/gallium/drivers/i915/**/*
-      - src/gallium/winsys/i915/**/*
-      - src/intel/**/*
-      when: on_success
-
-.i915g-manual-rules:
-  stage: intel
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-        *i915g_file_list
-      when: manual
-
-.crocus-rules:
-  stage: intel
-  rules:
-    - !reference [.anholt-farm-rules, rules]
-    - !reference [.gl-rules, rules]
-    - changes: &crocus_file_list
-      - src/gallium/drivers/crocus/**/*
-      - src/gallium/winsys/crocus/**/*
-      - src/intel/**/*
-      when: on_success
-
-.crocus-manual-rules:
-  stage: intel
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.anholt-farm-manual-rules, rules]
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-        *crocus_file_list
-      when: manual
-
-.iris-rules:
-  stage: intel
-  rules:
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    - !reference [.collabora-farm-rules, rules]
-    - !reference [.gl-rules, rules]
-    - changes: &iris_file_list
-      - src/gallium/drivers/iris/**/*
-      - src/gallium/winsys/iris/**/*
-      - src/intel/**/*
-      when: on_success
-
-.iris-manual-rules:
-  stage: intel
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.collabora-farm-manual-rules, rules]
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-        *iris_file_list
-      when: manual
-
-# Unfortunately we can't sed the on_success from another rules set, so we have
-# to do duplicate the files lists to set the job to manual (see
-# .performance-rules)
-.iris-rules-performance:
-  stage: intel
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.collabora-farm-manual-rules, rules]
-    - !reference [.performance-rules, rules]
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-        *iris_file_list
-      when: manual
-  allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
-  variables:
-    LAVA_JOB_PRIORITY: 40
-    S3_ARTIFACT_NAME: "mesa-x86_64-default-release"
-  needs:
-    - kernel+rootfs_x86_64
-    - debian-release
-
-.anv-rules:
-  stage: intel
-  rules:
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    - !reference [.collabora-farm-rules, rules]
-    - !reference [.vulkan-rules, rules]
-    - changes:
-      - src/intel/**/*
-      when: on_success
-
-.anv-manual-rules:
-  stage: intel
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.collabora-farm-manual-rules, rules]
-    - !reference [.vulkan-manual-rules, rules]
-    - changes:
-      - src/intel/**/*
-      when: manual
-
-.hasvk-rules:
-  stage: intel
-  rules:
-    - !reference [.anholt-farm-rules, rules]
-    - !reference [.vulkan-rules, rules]
-    - changes:
-      - src/intel/**/*
-      when: on_success
-
-.hasvk-manual-rules:
-  stage: intel
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.anholt-farm-manual-rules, rules]
-    - !reference [.vulkan-manual-rules, rules]
-    - changes:
-      - src/intel/**/*
-      when: on_success
-
-# ruleset to trigger on changes affecting either anv or iris, for jobs using both (piglit, skqp)
-.intel-rules:
-  stage: intel
-  rules:
-    - !reference [.iris-rules, rules]
-    - !reference [.anv-rules, rules]
-
-.intel-manual-rules:
-  stage: intel
-  rules:
-    - !reference [.iris-manual-rules, rules]
-    - !reference [.anv-manual-rules, rules]
-
 .virgl-rules:
   stage: layered-backends
   rules:
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index afb250b96f8..76b128f8be6 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -1,3 +1,139 @@
+.i915g-rules:
+  stage: intel
+  rules:
+    - !reference [.gl-rules, rules]
+    - changes: &i915g_file_list
+      - src/gallium/drivers/i915/**/*
+      - src/gallium/winsys/i915/**/*
+      - src/intel/**/*
+      when: on_success
+
+.i915g-manual-rules:
+  stage: intel
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *i915g_file_list
+      when: manual
+
+.crocus-rules:
+  stage: intel
+  rules:
+    - !reference [.anholt-farm-rules, rules]
+    - !reference [.gl-rules, rules]
+    - changes: &crocus_file_list
+      - src/gallium/drivers/crocus/**/*
+      - src/gallium/winsys/crocus/**/*
+      - src/intel/**/*
+      when: on_success
+
+.crocus-manual-rules:
+  stage: intel
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.anholt-farm-manual-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *crocus_file_list
+      when: manual
+
+.iris-rules:
+  stage: intel
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - !reference [.collabora-farm-rules, rules]
+    - !reference [.gl-rules, rules]
+    - changes: &iris_file_list
+      - src/gallium/drivers/iris/**/*
+      - src/gallium/winsys/iris/**/*
+      - src/intel/**/*
+      when: on_success
+
+.iris-manual-rules:
+  stage: intel
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.collabora-farm-manual-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *iris_file_list
+      when: manual
+
+# Unfortunately we can't sed the on_success from another rules set, so we have
+# to do duplicate the files lists to set the job to manual (see
+# .performance-rules)
+.iris-rules-performance:
+  stage: intel
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.collabora-farm-manual-rules, rules]
+    - !reference [.performance-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *iris_file_list
+      when: manual
+  allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
+  variables:
+    LAVA_JOB_PRIORITY: 40
+    S3_ARTIFACT_NAME: "mesa-x86_64-default-release"
+  needs:
+    - kernel+rootfs_x86_64
+    - debian-release
+
+.anv-rules:
+  stage: intel
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - !reference [.collabora-farm-rules, rules]
+    - !reference [.vulkan-rules, rules]
+    - changes:
+      - src/intel/**/*
+      when: on_success
+
+.anv-manual-rules:
+  stage: intel
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.collabora-farm-manual-rules, rules]
+    - !reference [.vulkan-manual-rules, rules]
+    - changes:
+      - src/intel/**/*
+      when: manual
+
+.hasvk-rules:
+  stage: intel
+  rules:
+    - !reference [.anholt-farm-rules, rules]
+    - !reference [.vulkan-rules, rules]
+    - changes:
+      - src/intel/**/*
+      when: on_success
+
+.hasvk-manual-rules:
+  stage: intel
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.anholt-farm-manual-rules, rules]
+    - !reference [.vulkan-manual-rules, rules]
+    - changes:
+      - src/intel/**/*
+      when: on_success
+
+# ruleset to trigger on changes affecting either anv or iris, for jobs using both (piglit, skqp)
+.intel-rules:
+  stage: intel
+  rules:
+    - !reference [.iris-rules, rules]
+    - !reference [.anv-rules, rules]
+
+.intel-manual-rules:
+  stage: intel
+  rules:
+    - !reference [.iris-manual-rules, rules]
+    - !reference [.anv-manual-rules, rules]
+
+
 .intel-common-test:
   extends:
     - .lava-test-deqp:x86_64