diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index c2dce3f1f5..ca9f364806 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -34,7 +34,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: ubuntu-precise
     image: ubuntu-precise
     ready-script: configure_mirror.sh
@@ -48,7 +48,7 @@ labels:
       - name: bluebox-sjc1
       - name: internap-mtl01
       - name: internap-nyj01
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: ubuntu-trusty
     image: ubuntu-trusty
     ready-script: configure_mirror.sh
@@ -63,7 +63,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: ubuntu-trusty-2-node
     image: ubuntu-trusty
     ready-script: multinode_setup.sh
@@ -79,7 +79,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: ubuntu-xenial
     image: ubuntu-xenial
     ready-script: configure_mirror.sh
@@ -94,7 +94,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: ubuntu-xenial-2-node
     image: ubuntu-xenial
     ready-script: multinode_setup.sh
@@ -110,7 +110,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: centos-7
     image: centos-7
     ready-script: configure_mirror.sh
@@ -125,7 +125,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: fedora-23
     image: fedora-23
     ready-script: configure_mirror.sh
@@ -140,7 +140,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: fedora-24
     image: fedora-24
     ready-script: configure_mirror.sh
@@ -155,7 +155,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: centos-7-2-node
     image: centos-7
     ready-script: multinode_setup.sh
@@ -171,7 +171,7 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
-      - name: infracloud
+      - name: infracloud-vanilla
   - name: tripleo-centos-7
     image: centos-7
     ready-script: configure_mirror.sh
@@ -802,9 +802,9 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-  - name: infracloud
+  - name: infracloud-vanilla
     region-name: 'RegionOne'
-    cloud: infracloud
+    cloud: infracloud-vanilla
     api-timeout: 60
     boot-timeout: 120
     max-servers: 0