diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml
index b14d17173..f9aeb12b7 100644
--- a/zuul.d/tripleo.yaml
+++ b/zuul.d/tripleo.yaml
@@ -4,46 +4,7 @@
 - job:
     name: tripleo-puppet-ci-centos-8-undercloud-containers
     parent: tripleo-ci-centos-8-undercloud-containers
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitreview$
-      - ^.gitignore$
-      - ^setup.cfg$
-      - ^setup.py$
-      - ^tox.ini$
-
-- project-template:
-    name: tripleo-puppet-undercloud
-    check:
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-puppet-ci-centos-8-undercloud-containers:
-            vars: &undercloud_consumer_vars
-              consumer_job: true
-              remove_tags:
-                - build
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-    gate:
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-puppet-ci-centos-8-undercloud-containers:
-            vars: *undercloud_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-
-- job:
-    name: tripleo-puppet-ci-centos-8-standalone
-    parent: tripleo-ci-centos-8-standalone
-    irrelevant-files:
+    irrelevant-files: &irrelevant_files
       - ^.*\.md$
       - ^.*\.rst$
       - ^doc/.*$
@@ -59,6 +20,36 @@
       - ^setup.cfg$
       - ^setup.py$
       - ^tox.ini$
+
+- job:
+    name: tripleo-puppet-ci-centos-8-content-provider
+    parent: tripleo-ci-centos-8-content-provider
+    irrelevant-files: *irrelevant_files
+
+- project-template:
+    name: tripleo-puppet-undercloud
+    check:
+      jobs:
+        - tripleo-puppet-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-undercloud-containers:
+            vars: &undercloud_consumer_vars
+              consumer_job: true
+              remove_tags:
+                - build
+            dependencies:
+              - tripleo-puppet-ci-centos-8-content-provider
+    gate:
+      jobs:
+        - tripleo-puppet-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-undercloud-containers:
+            vars: *undercloud_consumer_vars
+            dependencies:
+              - tripleo-puppet-ci-centos-8-content-provider
+
+- job:
+    name: tripleo-puppet-ci-centos-8-standalone
+    parent: tripleo-ci-centos-8-standalone
+    irrelevant-files: *irrelevant_files
     vars:
       featureset_override:
         standalone_environment_files:
@@ -68,7 +59,7 @@
     name: tripleo-puppet-standalone
     check:
       jobs:
-        - tripleo-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-content-provider
         - tripleo-puppet-ci-centos-8-standalone:
             vars: &standalone_consumer_vars
               consumer_job: true
@@ -76,11 +67,11 @@
               remove_tags:
                 - build
             dependencies:
-              - tripleo-ci-centos-8-content-provider
+              - tripleo-puppet-ci-centos-8-content-provider
     gate:
       jobs:
-        - tripleo-ci-centos-8-content-provider
+        - tripleo-puppet-ci-centos-8-content-provider
         - tripleo-puppet-ci-centos-8-standalone:
             vars: *standalone_consumer_vars
             dependencies:
-              - tripleo-ci-centos-8-content-provider
+              - tripleo-puppet-ci-centos-8-content-provider