diff --git a/playbooks/update_puppet.yaml b/playbooks/update_puppet.yaml
new file mode 100644
index 0000000000..ebbfc0a828
--- /dev/null
+++ b/playbooks/update_puppet.yaml
@@ -0,0 +1,10 @@
+---
+- hosts: '!puppetmaster.openstack.org'
+  gather_facts: false
+  tasks:
+  - synchronize:
+      src: /opt/system-config/production
+      dest: /opt/system-config
+  - synchronize:
+      src: /etc/puppet/modules
+      dest: /etc/puppet
diff --git a/run_all.sh b/run_all.sh
index e3b8a99e59..d9c74273c2 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -36,8 +36,9 @@ touch manifests/site.pp
 # errexit
 set +e
 
-# First run the git/gerrit sequence, since it's important that they all work
-# together
+# First, sync the puppet repos with all the machines
+ansible-playbook -f 20 ${ANSIBLE_PLAYBOOKS}/update_puppet.yaml
+# Run the git/gerrit sequence, since it's important that they all work together
 ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_git.yaml
 # Run AFS changes separately so we can make sure to only do one at a time
 # (turns out quorum is nice to have)