diff --git a/zuul.d/deprecated-jobs.yaml b/zuul.d/deprecated-jobs.yaml
index b050e059b..e756fb937 100644
--- a/zuul.d/deprecated-jobs.yaml
+++ b/zuul.d/deprecated-jobs.yaml
@@ -721,3 +721,54 @@
               - deployment/rabbitmq/*
               # puppet
               - manifests/profile/base/rabbitmq.pp
+
+#
+# Deprecated Undercloud templates
+#
+- project-template:
+    name: tripleo-undercloud-jobs
+    check:
+      jobs:
+        - tripleo-ci-centos-7-undercloud-oooq:
+            irrelevant-files: &undercloud_ignored
+              - ^.*\.md$
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^docs/.*$
+              - ^etc/.*$
+              - ^metadata.json$
+              - ^releasenotes/.*$
+              - ^test-requirements.txt$
+              - ^spec/.*$
+              - ^Puppetfile.*$
+              - tox.ini
+              - ^roles/build-containers/.*$
+              - ^roles/oooci-build-images/.*$
+              - ^roles/tripleo-repos/.*$
+              - ^playbooks/deprecated/.*$
+              - ^playbooks/tripleo-buildcontainers/.*$
+              - ^playbooks/tripleo-buildimages/.*$
+              - ^vars/sova-patterns.yml$
+              - zuul.d/layout.yaml
+              - zuul.d/build-containers.yaml
+              - zuul.d/build-image.yaml
+              - zuul.d/standalone-jobs.yaml
+              - zuul.d/multinode-jobs.yaml
+
+        - tripleo-ci-centos-8-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
+            irrelevant-files: *undercloud_ignored
+    gate:
+      queue: tripleo
+      jobs:
+        - tripleo-ci-centos-7-undercloud-oooq:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-8-undercloud-containers:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-7-containers-undercloud-minion:
+            irrelevant-files: *undercloud_ignored
+        - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
+            irrelevant-files: *undercloud_ignored
diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml
index fe9afa04c..34784543d 100644
--- a/zuul.d/undercloud-jobs.yaml
+++ b/zuul.d/undercloud-jobs.yaml
@@ -4,10 +4,12 @@
 # It contains all the jobs related to undercloud testing.
 
 - project-template:
-    name: tripleo-undercloud-jobs
+    name: tripleo-undercloud-jobs-pipeline
     check:
       jobs:
-        - tripleo-ci-centos-7-undercloud-oooq:
+        - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-7-content-provider
+        - tripleo-ci-centos-8-undercloud-containers:
             irrelevant-files: &undercloud_ignored
               - ^.*\.md$
               - ^.*\.rst$
@@ -32,33 +34,6 @@
               - zuul.d/build-image.yaml
               - zuul.d/standalone-jobs.yaml
               - zuul.d/multinode-jobs.yaml
-
-        - tripleo-ci-centos-8-undercloud-containers:
-            irrelevant-files: *undercloud_ignored
-        - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
-            irrelevant-files: *undercloud_ignored
-    gate:
-      queue: tripleo
-      jobs:
-        - tripleo-ci-centos-7-undercloud-oooq:
-            irrelevant-files: *undercloud_ignored
-        - tripleo-ci-centos-7-undercloud-containers:
-            irrelevant-files: *undercloud_ignored
-        - tripleo-ci-centos-8-undercloud-containers:
-            irrelevant-files: *undercloud_ignored
-        - tripleo-ci-centos-7-containers-undercloud-minion:
-            irrelevant-files: *undercloud_ignored
-        - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
-            irrelevant-files: *undercloud_ignored
-
-- project-template:
-    name: tripleo-undercloud-jobs-pipeline
-    check:
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-7-content-provider
-        - tripleo-ci-centos-8-undercloud-containers:
-            irrelevant-files: *undercloud_ignored
             vars: &undercloud_consumer_vars
               consumer_job: true
               remove_tags: