diff --git a/bootstrap_puppet_infra_nodes.yml b/bootstrap_puppet_infra_nodes.yml
index 2ec7739..a40ebff 100644
--- a/bootstrap_puppet_infra_nodes.yml
+++ b/bootstrap_puppet_infra_nodes.yml
@@ -1,6 +1,6 @@
 ---
 # file: bootstrap_puppet_infra_nodes.yml
-- hosts: infra:!meta-infra_type_puppetmaster
+- hosts: infra:!puppetmaster
   user: ubuntu
   become: true
   roles:
diff --git a/bootstrap_puppetmaster.yml b/bootstrap_puppetmaster.yml
index 7b78c13..e315cf7 100644
--- a/bootstrap_puppetmaster.yml
+++ b/bootstrap_puppetmaster.yml
@@ -1,6 +1,6 @@
 ---
 # file: bootstrap_puppetmaster.yml
-- hosts: meta-infra_type_puppetmaster
+- hosts: puppetmaster
   gather_facts: no
   user: ubuntu
   become: true
diff --git a/roles/bootstrap_gerrit/tasks/main.yml b/roles/bootstrap_gerrit/tasks/main.yml
index 1197d60..b9687bf 100644
--- a/roles/bootstrap_gerrit/tasks/main.yml
+++ b/roles/bootstrap_gerrit/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Fetch Gerrit MySQL password from Puppetmaster hiera
   command: hiera -c /etc/puppet/hiera.yaml gerrit_mysql_password environment=production
-  delegate_to: "{{ groups['meta-infra_type_puppetmaster'][0] }}"
+  delegate_to: "{{ groups['puppetmaster'][0] }}"
   register: gerrit_mysql_password
   no_log: True
 
diff --git a/roles/bootstrap_jjb/tasks/main.yml b/roles/bootstrap_jjb/tasks/main.yml
index 857edc5..f2247b7 100644
--- a/roles/bootstrap_jjb/tasks/main.yml
+++ b/roles/bootstrap_jjb/tasks/main.yml
@@ -4,7 +4,7 @@
 
 - name: Get JJB password from Puppetmaster Hiera
   command: hiera -c /etc/puppet/hiera.yaml jenkins_jobs_password environment=production
-  delegate_to: "{{ groups['meta-infra_type_puppetmaster'][0] }}"
+  delegate_to: "{{ groups['puppetmaster'][0] }}"
   register: jenkins_jobs_password
   no_log: True
 
diff --git a/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 b/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2
index b7ffe61..fa9ac56 100644
--- a/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2
+++ b/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2
@@ -1,5 +1,5 @@
 [main]
-server={{ groups['meta-infra_type_puppetmaster'][0] }}
+server={{ groups['puppetmaster'][0] }}
 certname={{ inventory_hostname }}
 logdir=/var/log/puppet
 vardir=/var/lib/puppet
diff --git a/roles/bootstrap_puppetmaster/templates/puppet.conf.j2 b/roles/bootstrap_puppetmaster/templates/puppet.conf.j2
index b715800..fc6bf60 100644
--- a/roles/bootstrap_puppetmaster/templates/puppet.conf.j2
+++ b/roles/bootstrap_puppetmaster/templates/puppet.conf.j2
@@ -1,5 +1,5 @@
 [main]
-server={{ groups['meta-infra_type_puppetmaster'][0] }}
+server={{ groups['puppetmaster'][0] }}
 certname={{ inventory_hostname }}
 logdir=/var/log/puppet
 vardir=/var/lib/puppet