diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index aed4ec2780..988ac279c9 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -637,16 +637,20 @@
       - opendev/ansible-role-puppet
       - opendev/system-config
     files:
+      - Gemfile
+      - Rakefile
+      - modules.env
+      - install_modules.sh
       - hiera/
       - inventory/
+      - roles/puppet-install/
+      - playbooks/install_puppet.yaml
+      - playbooks/update_puppet_version.yaml
       - playbooks/remote_puppet_else.yaml
-      - inventory/service/group_vars/
-      - inventory/service/host_vars/
-      - inventory/service/group_vars/puppet
-      - playbooks/roles/run-puppet/
+      - playbooks/roles/puppet-run/
       - playbooks/roles/install-ansible-roles/
-      - playbooks/roles/puppet-install/
       - playbooks/roles/disable-puppet-agent/
+      - playbooks/roles/puppet-setup-ansible/
       - playbooks/roles/iptables/
       - modules/
       - manifests/
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5d7f82ad3d..3973266b71 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -406,6 +406,7 @@
         - infra-prod-run-accessbot
         - infra-prod-service-afs
         - infra-prod-service-zuul-preview
+        - infra-prod-remote-puppet-else
         - infra-prod-run-cloud-launcher
     opendev-prod-hourly:
       jobs:
@@ -430,7 +431,3 @@
             dependencies:
               - name: infra-prod-install-ansible
                 soft: true
-        - infra-prod-remote-puppet-else:
-            dependencies:
-              - name: infra-prod-install-ansible
-                soft: true