diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
index b18094f9d7..e76db31aa5 100644
--- a/playbooks/group_vars/all.yaml
+++ b/playbooks/group_vars/all.yaml
@@ -1,2 +1,4 @@
 puppetmaster: puppetmaster.openstack.org
 copy_hieradata: true
+copy_puppet: true
+manifest_base: /etc/system-config
diff --git a/playbooks/update_puppet.yaml b/playbooks/update_puppet.yaml
index f00f02b3e0..e026d1239b 100644
--- a/playbooks/update_puppet.yaml
+++ b/playbooks/update_puppet.yaml
@@ -13,22 +13,3 @@
   - shell: ansible-galaxy install --force -r roles.yaml
     args:
       chdir: /opt/system-config/production
-- hosts: '!puppetmaster.openstack.org:!disabled'
-  gather_facts: false
-  tasks:
-  - synchronize:
-      src: /opt/system-config/production
-      dest: /opt/system-config
-  - synchronize:
-      src: /etc/puppet/modules
-      dest: /etc/puppet
-  - file:
-      path: /etc/puppet/hieradata
-      state: directory
-      mode: 0700
-      owner: root
-      group: root
-  - file:
-      src: /etc/puppet/hieradata
-      dest: /opt/system-config/hieradata
-      state: link