diff --git a/grafana/nodepool-infracloud.yaml b/grafana/nodepool-infracloud.yaml
index b25ad81015..e39d203deb 100644
--- a/grafana/nodepool-infracloud.yaml
+++ b/grafana/nodepool-infracloud.yaml
@@ -141,23 +141,6 @@ dashboard:
           seriesOverrides:
             - alias: Max
               stack: False
-        - title: Test Nodes (Vanilla)
-          type: graph
-          span: 4
-          stack: true
-          tooltip:
-            value_type: individual
-          leftYAxisLabel: "nodes"
-          targets:
-            - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.building, 'Building')
-            - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.ready, 'Available')
-            - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.in-use, 'In Use')
-            - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.used, 'Used')
-            - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.nodes.deleting, 'Deleting')
-            - target: alias(stats.gauges.nodepool.provider.infracloud-vanilla.max_servers, 'Max')
-          seriesOverrides:
-            - alias: Max
-              stack: False
     - title: Job Runtimes
       showTitle: true
       height: 250px
@@ -171,4 +154,3 @@ dashboard:
             - none
           targets:
             - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.infracloud-chocolate.runtime.mean, '0.001'), 'chocolate')
-            - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.infracloud-vanilla.runtime.mean, '0.001'), 'vanilla')
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index cd35328282..7012ee6f86 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -303,59 +303,6 @@ providers:
             diskimage: ubuntu-xenial
             key-name: infra-root-keys
 
-  - name: infracloud-vanilla
-    region-name: 'RegionOne'
-    cloud: infracloud-vanilla
-    boot-timeout: 120
-    rate: 0.25
-    diskimages:
-      - name: centos-7
-        config-drive: true
-      - name: debian-jessie
-        config-drive: true
-      - name: fedora-26
-        config-drive: true
-      - name: opensuse-423
-        config-drive: true
-      - name: ubuntu-trusty
-        config-drive: true
-      - name: ubuntu-xenial
-        config-drive: true
-    pools:
-      - name: main
-        max-servers: 0
-        labels:
-          - name: centos-7
-            min-ram: 8000
-            flavor-name: 'nodepool'
-            diskimage: centos-7
-            key-name: infra-root-keys
-          - name: debian-jessie
-            min-ram: 8000
-            flavor-name: 'nodepool'
-            diskimage: debian-jessie
-            key-name: infra-root-keys
-          - name: fedora-26
-            min-ram: 8000
-            flavor-name: 'nodepool'
-            diskimage: fedora-26
-            key-name: infra-root-keys
-          - name: opensuse-423
-            min-ram: 8000
-            flavor-name: 'nodepool'
-            diskimage: opensuse-423
-            key-name: infra-root-keys
-          - name: ubuntu-trusty
-            min-ram: 8000
-            flavor-name: 'nodepool'
-            diskimage: ubuntu-trusty
-            key-name: infra-root-keys
-          - name: ubuntu-xenial
-            min-ram: 8000
-            flavor-name: 'nodepool'
-            diskimage: ubuntu-xenial
-            key-name: infra-root-keys
-
   - name: ovh-bhs1
     region-name: 'BHS1'
     cloud: ovh
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 2e0ba8d851..b527e7b2af 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -35,7 +35,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -53,7 +52,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -72,7 +70,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -90,7 +87,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -109,7 +105,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -128,7 +123,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -146,7 +140,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -164,7 +157,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -182,7 +174,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -201,7 +192,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -220,7 +210,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -239,7 +228,6 @@ labels:
       - name: ovh-gra1
       - name: ovh-bhs1
       - name: inap-mtl01
-      - name: infracloud-vanilla
       - name: infracloud-chocolate
       - name: citycloud-lon1
       - name: citycloud-kna1
@@ -626,65 +614,6 @@ providers:
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
         key-name: infra-root-keys
-  - name: infracloud-vanilla
-    region-name: 'RegionOne'
-    cloud: infracloud-vanilla
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    nodepool-id: 'nodepool.openstack.org'
-    rate: 0.25
-    image-type: 'qcow2'
-    template-hostname: '{image.name}-{timestamp}'
-    images:
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-        key-name: infra-root-keys
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-        key-name: infra-root-keys
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-        key-name: infra-root-keys
-      - name: fedora-26
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: fedora-26
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-        key-name: infra-root-keys
-      - name: centos-7
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-        key-name: infra-root-keys
-      - name: opensuse-423
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: opensuse-423
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-        key-name: infra-root-keys
   - name: infracloud-chocolate
     region-name: 'RegionOne'
     cloud: infracloud-chocolate