diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index ed616ebb0f..dd8e298b59 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -133,7 +133,7 @@ providers:
     boot-timeout: 120
     max-servers: 5
     images:
-      - name: devstack-precise
+      - name: devstack-precise-check
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
         min-ram: 8192
         setup: prepare_node_devstack.sh
@@ -150,7 +150,7 @@ providers:
     boot-timeout: 120
     max-servers: 5
     images:
-      - name: devstack-precise
+      - name: devstack-precise-check
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
         min-ram: 8192
         setup: prepare_node_devstack.sh
@@ -191,14 +191,14 @@ targets:
           - name: hpcloud-az1
           - name: hpcloud-az2
           - name: hpcloud-az3
-          - name: hpcloud-region-a
-          - name: hpcloud-region-b
       - name: devstack-precise-check
         min-ready: 10
         providers:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+          - name: hpcloud-region-a
+          - name: hpcloud-region-b
       - name: tripleo-precise
         min-ready: 1
         providers:
@@ -216,14 +216,14 @@ targets:
           - name: hpcloud-az1
           - name: hpcloud-az2
           - name: hpcloud-az3
-          - name: hpcloud-region-a
-          - name: hpcloud-region-b
       - name: devstack-precise-check
         min-ready: 10
         providers:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+          - name: hpcloud-region-a
+          - name: hpcloud-region-b
       - name: tripleo-precise
         min-ready: 1
         providers: