diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml
index 1c6467ab0c..736775b617 100644
--- a/playbooks/remote_puppet_else.yaml
+++ b/playbooks/remote_puppet_else.yaml
@@ -1,4 +1,4 @@
-- hosts: '!review.openstack.org:!git0*:!zuul[0-9]+.*:!zuulv3*:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
+- hosts: '!review.openstack.org:!git0*:!zuul*:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
   strategy: free
   gather_facts: true
   roles:
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index 612e5317d4..3519868b6c 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -29,16 +29,7 @@
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
       vars:
         puppet_timeout: 60m
-- hosts: "zuul[0-9]+.openstack.org:!disabled"
-  strategy: free
-  gather_facts: true
-  roles:
-    - role: puppet
-      facts:
-        project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
-      vars:
-        puppet_timeout: 60m
-- hosts: "zuulv3.openstack.org:!disabled"
+- hosts: "zuul*.openstack.org:!disabled"
   strategy: free
   gather_facts: true
   roles: