diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 2d45a314f1..091ebf5e67 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -218,11 +218,13 @@ labels:
     min-ready: 8
     providers:
       - name: tripleo-test-cloud-rh1
+      - name: tripleo-test-cloud-hp1
   - name: tripleo-f20
     image: tripleo-f20
     min-ready: 8
     providers:
       - name: tripleo-test-cloud-rh1
+      - name: tripleo-test-cloud-hp1
 
 providers:
   - name: rax-dfw
@@ -979,19 +981,19 @@ providers:
         setup: prepare_node_py3k.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-  - name: tripleo-test-cloud
+  - name: tripleo-test-cloud-hp1
     service-type: 'compute'
     service-name: 'nova'
     username: '<%= tripleo_username %>'
     password: '<%= tripleo_password %>'
     project-id: '<%= tripleo_project %>'
-    auth-url: 'https://ci-overcloud.tripleo.org:13000/v2.0'
+    auth-url: 'https://ci-overcloud.hp1.tripleo.org:13000/v2.0'
     boot-timeout: 120
-    max-servers: 0
+    max-servers: 90
     rate: 0.001
     networks:
-      - net-id: a395fac5-adec-4ab9-a605-963558349cfd
-      - net-id: 063ec9df-2fec-4723-8d4b-92c60193bd08
+      - net-label: default-net
+      - net-label: tripleo-bm-test
     images:
       - name: tripleo-precise
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'