diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml
index 0c3e5d2..e422fa0 100644
--- a/roles/bootstrap_puppetmaster/tasks/main.yml
+++ b/roles/bootstrap_puppetmaster/tasks/main.yml
@@ -86,7 +86,7 @@
 - name: Deploy Zuul fqdn hiera file
   copy: >
     src=hiera/fqdn/zuul.yaml
-    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_zuul'][0] }}.yaml
+    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['zuul'][0] }}.yaml
 
 - name: Deploy Jenkins fqdn hiera file
   copy: >
diff --git a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2
index 7d7f46b..90affe8 100644
--- a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2
+++ b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2
@@ -7,7 +7,7 @@ class infra-ansible::profiles::zuul {
     gerrit_server        => '{{ groups['gerrit'][0] }}',
     gerrit_user          => 'gerrit',
     zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
-    zuul_url             => 'http://{{ groups['meta-infra_type_zuul'][0] }}/p',
+    zuul_url             => 'http://{{ groups['zuul'][0] }}/p',
   }
 
   class { '::zuul::server':
diff --git a/run_puppet_on_zuul.yml b/run_puppet_on_zuul.yml
index d0e3e9f..d2be423 100644
--- a/run_puppet_on_zuul.yml
+++ b/run_puppet_on_zuul.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: meta-infra_type_zuul
+- hosts: zuul
   user: ubuntu
   gather_facts: no
   become: true