diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index b108ff1c1f..ffe82365e3 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -38,13 +38,6 @@ labels:
       - name: osic-cloud8
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: ubuntu-precise
     image: ubuntu-precise
     ready-script: configure_mirror.sh
@@ -59,13 +52,6 @@ labels:
       - name: internap-mtl01
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: ubuntu-trusty
     image: ubuntu-trusty
     ready-script: configure_mirror.sh
@@ -84,13 +70,6 @@ labels:
       - name: osic-cloud8
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: ubuntu-trusty-2-node
     image: ubuntu-trusty
     ready-script: multinode_setup.sh
@@ -128,13 +107,6 @@ labels:
       - name: osic-cloud8
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: ubuntu-xenial-2-node
     image: ubuntu-xenial
     ready-script: multinode_setup.sh
@@ -172,13 +144,6 @@ labels:
       - name: osic-cloud8
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: fedora-23
     image: fedora-23
     ready-script: configure_mirror.sh
@@ -197,13 +162,6 @@ labels:
       - name: osic-cloud8
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: fedora-24
     image: fedora-24
     ready-script: configure_mirror.sh
@@ -222,13 +180,6 @@ labels:
       - name: osic-cloud8
       - name: infracloud-vanilla
       - name: infracloud-chocolate
-      - name: datacentred-sal01
-      - name: citycloud-lon1
-      - name: citycloud-fra1
-      - name: citycloud-kna1
-      - name: entercloud-nlams1
-      - name: entercloud-defra1
-      - name: entercloud-itmil1
   - name: centos-7-2-node
     image: centos-7
     ready-script: multinode_setup.sh
@@ -1137,412 +1088,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-  - name: datacentred-sal01
-    region-name: 'sal01'
-    cloud: datacentred
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: 'dc1.8x8'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: citycloud-fra1
-    region-name: 'Fra1'
-    cloud: citycloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: citycloud-lon1
-    region-name: 'Lon1'
-    cloud: citycloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: citycloud-kna1
-    region-name: 'Kna1'
-    cloud: citycloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: '8C-8GB-100GB'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: entercloud-nlams1
-    region-name: 'nl-ams1'
-    cloud: entercloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: entercloud-defra1
-    region-name: 'de-fra1'
-    cloud: entercloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: entercloud-itmil1
-    region-name: 'it-mil1'
-    cloud: entercloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.25
-    image-type: 'qcow2'
-    images:
-      - name: ubuntu-precise
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-xenial
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: ubuntu-xenial
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: debian-jessie
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: debian-jessie
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-23
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: fedora-23
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-24
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: fedora-24
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: centos-7
-        min-ram: 8000
-        name-filter: 'OpenstackFoundation-8CPU'
-        diskimage: centos-7
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
 
 targets:
   - name: zuul