diff --git a/bootstrap_jjb.yml b/bootstrap_jjb.yml
index 290fba6..d32bd91 100644
--- a/bootstrap_jjb.yml
+++ b/bootstrap_jjb.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: meta-infra_type_jenkins
+- hosts: jenkins
   gather_facts: no
   user: ubuntu
   become: true
diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml
index e422fa0..c239d92 100644
--- a/roles/bootstrap_puppetmaster/tasks/main.yml
+++ b/roles/bootstrap_puppetmaster/tasks/main.yml
@@ -91,7 +91,7 @@
 - name: Deploy Jenkins fqdn hiera file
   copy: >
     src=hiera/fqdn/jenkins.yaml
-    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_jenkins'][0] }}.yaml
+    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['jenkins'][0] }}.yaml
 
 - name: Start puppet agent service
   service: name=puppet enabled=yes state=started
diff --git a/run_puppet_on_jenkins.yml b/run_puppet_on_jenkins.yml
index a239ea2..06799fc 100644
--- a/run_puppet_on_jenkins.yml
+++ b/run_puppet_on_jenkins.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: meta-infra_type_jenkins
+- hosts: jenkins
   user: ubuntu
   become: true
   name: Run Puppet to install Jenkins