diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml
index 748a831b6d..ecbaa6e646 100644
--- a/playbooks/remote_puppet_else.yaml
+++ b/playbooks/remote_puppet_else.yaml
@@ -1,4 +1,4 @@
-- hosts: '!review.openstack.org:!git0*:!afs*'
+- hosts: '!review.openstack.org:!git0*:!afs*:!puppetmaster*'
   gather_facts: true
   roles:
   - role: puppet
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index b2b9305b13..e0c6db57ef 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -7,6 +7,9 @@
     # the remote_head value in returndict.after
     - git: repo=https://git.openstack.org/openstack-infra/project-config clone=no
       register: gitinfo
+  roles:
+    - role: puppet
+      copy_hieradata: False
 - hosts: git0*
   gather_facts: true
   max_fail_percentage: 1