diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index e64fc11e75..2ba97f03e4 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -226,7 +226,7 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
     images:
       - name: bare-precise
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: rax-iad
           - name: rax-ord
@@ -234,7 +234,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise
-        min-ready: 10
+        min-ready: 6
         providers:
           - name: rax-iad
           - name: rax-dfw
@@ -243,7 +243,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: hpcloud-region-b
       - name: tripleo-precise
@@ -258,7 +258,7 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
     images:
       - name: bare-precise
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: rax-iad
           - name: rax-ord
@@ -266,7 +266,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise
-        min-ready: 10
+        min-ready: 6
         providers:
           - name: rax-iad
           - name: rax-dfw
@@ -275,7 +275,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: hpcloud-region-b
       - name: tripleo-precise
@@ -290,7 +290,7 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
     images:
       - name: bare-precise
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: rax-iad
           - name: rax-ord
@@ -298,7 +298,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise
-        min-ready: 10
+        min-ready: 6
         providers:
           - name: rax-iad
           - name: rax-dfw
@@ -307,7 +307,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: hpcloud-region-b
   - name: jenkins04
@@ -318,7 +318,7 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
     images:
       - name: bare-precise
-        min-ready: 5
+        min-ready: 3
         providers:
           - name: rax-iad
           - name: rax-ord
@@ -326,7 +326,7 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise
-        min-ready: 10
+        min-ready: 6
         providers:
           - name: rax-iad
           - name: rax-dfw
@@ -335,6 +335,90 @@ targets:
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
-        min-ready: 5
+        min-ready: 3
+        providers:
+          - name: hpcloud-region-b
+  - name: jenkins05
+    jenkins:
+      url: 'https://jenkins05.openstack.org/'
+      user: '<%= jenkins_api_user %>'
+      apikey: '<%= jenkins_api_key %>'
+      credentials-id: '<%= jenkins_credentials_id %>'
+    images:
+      - name: bare-precise
+        min-ready: 3
+        providers:
+          - name: rax-iad
+          - name: rax-ord
+          - name: hpcloud-az1
+          - name: hpcloud-az2
+          - name: hpcloud-az3
+      - name: devstack-precise
+        min-ready: 6
+        providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
+          - name: hpcloud-az1
+          - name: hpcloud-az2
+          - name: hpcloud-az3
+      - name: devstack-precise-check
+        min-ready: 3
+        providers:
+          - name: hpcloud-region-b
+  - name: jenkins06
+    jenkins:
+      url: 'https://jenkins06.openstack.org/'
+      user: '<%= jenkins_api_user %>'
+      apikey: '<%= jenkins_api_key %>'
+      credentials-id: '<%= jenkins_credentials_id %>'
+    images:
+      - name: bare-precise
+        min-ready: 3
+        providers:
+          - name: rax-iad
+          - name: rax-ord
+          - name: hpcloud-az1
+          - name: hpcloud-az2
+          - name: hpcloud-az3
+      - name: devstack-precise
+        min-ready: 6
+        providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
+          - name: hpcloud-az1
+          - name: hpcloud-az2
+          - name: hpcloud-az3
+      - name: devstack-precise-check
+        min-ready: 3
+        providers:
+          - name: hpcloud-region-b
+  - name: jenkins07
+    jenkins:
+      url: 'https://jenkins07.openstack.org/'
+      user: '<%= jenkins_api_user %>'
+      apikey: '<%= jenkins_api_key %>'
+      credentials-id: '<%= jenkins_credentials_id %>'
+    images:
+      - name: bare-precise
+        min-ready: 3
+        providers:
+          - name: rax-iad
+          - name: rax-ord
+          - name: hpcloud-az1
+          - name: hpcloud-az2
+          - name: hpcloud-az3
+      - name: devstack-precise
+        min-ready: 6
+        providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
+          - name: hpcloud-az1
+          - name: hpcloud-az2
+          - name: hpcloud-az3
+      - name: devstack-precise-check
+        min-ready: 3
         providers:
           - name: hpcloud-region-b