diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
new file mode 100644
index 0000000000..931507e997
--- /dev/null
+++ b/playbooks/group_vars/all.yaml
@@ -0,0 +1 @@
+puppetmaster: puppetmaster.openstack.org
diff --git a/playbooks/remote_puppet_afs.yaml b/playbooks/remote_puppet_afs.yaml
index d8f75f7d12..5c1e5fded6 100644
--- a/playbooks/remote_puppet_afs.yaml
+++ b/playbooks/remote_puppet_afs.yaml
@@ -2,4 +2,4 @@
 - hosts: "afs*"
   gather_facts: false
   roles:
-    - { role: puppet, puppetmaster: puppetmaster.openstack.org }
+  - role: puppet
diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml
index 17318f1505..51da3aec85 100644
--- a/playbooks/remote_puppet_else.yaml
+++ b/playbooks/remote_puppet_else.yaml
@@ -1,5 +1,4 @@
----
-- hosts: "!review.openstack.org:!git0*:!afs*"
+- hosts: '!review.openstack.org:!git0*:!afs*'
   gather_facts: false
   roles:
-    - { role: puppet, puppetmaster: puppetmaster.openstack.org }
+  - role: puppet
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index a85c488f53..15fe96b464 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -12,13 +12,11 @@
   max_fail_percentage: 1
   roles:
     - role: puppet
-      puppetmaster: puppetmaster.openstack.org
       facts:
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
 - hosts: review.openstack.org
   gather_facts: false
   roles:
     - role: puppet
-      puppetmaster: puppetmaster.openstack.org
       facts:
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"