diff --git a/bootstrap_gerrit.yml b/bootstrap_gerrit.yml
index bfd82cd..4df944e 100644
--- a/bootstrap_gerrit.yml
+++ b/bootstrap_gerrit.yml
@@ -1,6 +1,6 @@
 ---
 # file: boostrap_gerrit.yml
-- hosts: meta-infra_type_gerrit
+- hosts: gerrit
   gather_facts: no
   user: ubuntu
   become: true
diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml
index 762f73d..0c3e5d2 100644
--- a/roles/bootstrap_puppetmaster/tasks/main.yml
+++ b/roles/bootstrap_puppetmaster/tasks/main.yml
@@ -81,7 +81,7 @@
 - name: Deploy Gerrit fqdn hiera file
   copy: >
     src=hiera/fqdn/gerrit.yaml
-    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_gerrit'][0] }}.yaml
+    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['gerrit'][0] }}.yaml
 
 - name: Deploy Zuul 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 772e972..7d7f46b 100644
--- a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2
+++ b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2
@@ -4,7 +4,7 @@ class infra-ansible::profiles::zuul {
   }
 
   class { '::zuul':
-    gerrit_server        => '{{ groups['meta-infra_type_gerrit'][0] }}',
+    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',
diff --git a/run_puppet_on_gerrit.yml b/run_puppet_on_gerrit.yml
index 8a9b690..33848e7 100644
--- a/run_puppet_on_gerrit.yml
+++ b/run_puppet_on_gerrit.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: meta-infra_type_gerrit
+- hosts: gerrit
   user: ubuntu
   gather_facts: no
   become: true