diff --git a/playbooks/remote_puppet_infracloud.yaml b/playbooks/remote_puppet_infracloud.yaml
index 522cac3394..d49d8dcb45 100644
--- a/playbooks/remote_puppet_infracloud.yaml
+++ b/playbooks/remote_puppet_infracloud.yaml
@@ -1,8 +1,4 @@
 ---
-- hosts: "baremetal*.ic.openstack.org:!disabled"
-  gather_facts: true
-  roles:
-    - role: puppet
 - hosts: "controller*.ic.openstack.org:!disabled"
   gather_facts: true
   roles:
diff --git a/playbooks/remote_puppet_infracloud_baremetal.yaml b/playbooks/remote_puppet_infracloud_baremetal.yaml
new file mode 100644
index 0000000000..ac025e577e
--- /dev/null
+++ b/playbooks/remote_puppet_infracloud_baremetal.yaml
@@ -0,0 +1,5 @@
+---
+- hosts: "baremetal*.ic.openstack.org:!disabled"
+  gather_facts: true
+  roles:
+    - role: puppet
diff --git a/run_infracloud.sh b/run_infracloud.sh
index 7626684a79..8f9cec91dd 100755
--- a/run_infracloud.sh
+++ b/run_infracloud.sh
@@ -30,4 +30,5 @@ set +e
 # Run all the ansible playbooks under timeout to prevent them from getting
 # stuck if they are oomkilled
 
+timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_infracloud_baremetal.yaml
 timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_infracloud.yaml