diff --git a/.zuul.yaml b/.zuul.yaml
index 7625e3fd23..ed1a92eb5e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1428,19 +1428,6 @@
     name: infra-prod-manage-projects-runs
     max: 1
 
-- job:
-    name: infra-prod-manage-projects
-    parent: infra-prod-playbook
-    description: |
-      Create and update projects in gerrit and gitea.
-    allowed-projects:
-      - opendev/system-config
-      - openstack/project-config
-    semaphore: infra-prod-manage-projects-runs
-    vars:
-      playbook_name: manage-projects.yaml
-      ansible_forks: 50
-
 - job:
     name: infra-prod-update-system-config
     parent: infra-prod-playbook
@@ -1460,6 +1447,7 @@
       - playbooks/install-ansible.yaml
       - playbooks/roles/pip3/.*
       - playbooks/roles/install-ansible/.*
+      - playbooks/roles/logrotate/.*
       - playbooks/roles/root-keys/.*
       - playbooks/host_vars/bridge.openstack.org.yaml
       - playbooks/zuul/run-production-playbook.yaml
@@ -1475,6 +1463,32 @@
     vars:
       playbook_name: base.yaml
       ansible_forks: 50
+    files:
+      - inventory/.*
+      - playbooks/host_vars/.*
+      - playbooks/group_vars/.*
+      - playbooks/base.yaml
+      - playbooks/roles/users/.*
+      - playbooks/roles/base-repos/.*
+      - playbooks/roles/base-server/.*
+      - playbooks/roles/timezone/.*
+      - playbooks/roles/unbound/.*
+      - playbooks/roles/exim/.*
+      - playbooks/roles/snmpd/.*
+      - playbooks/roles/iptables/.*
+
+- job:
+    name: infra-prod-manage-projects
+    parent: infra-prod-playbook
+    description: |
+      Create and update projects in gerrit and gitea.
+    allowed-projects:
+      - opendev/system-config
+      - openstack/project-config
+    semaphore: infra-prod-manage-projects-runs
+    vars:
+      playbook_name: manage-projects.yaml
+      ansible_forks: 50
 
 - job:
     name: system-config-goaccess-report
@@ -1805,8 +1819,8 @@
         - system-config-promote-image-python-builder-3.7
         - system-config-promote-image-python-builder-3.8
         - infra-prod-update-system-config
-        - infra-prod-base
         - infra-prod-install-ansible
+        - infra-prod-base
         - infra-prod-manage-projects:
             files:
               - playbooks/manage-projects.yaml
@@ -1837,5 +1851,5 @@
         - zuul-ci-goaccess-report
         # Nightly runs of ansible things for catchup
         - infra-prod-update-system-config
-        - infra-prod-base
         - infra-prod-install-ansible
+        - infra-prod-base