diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index 24af495c05..a707559302 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -46,13 +46,12 @@ labels:
     min-ready: 0
 
 providers:
-  - name: citycloud-kna1
-    region-name: 'Kna1'
-    cloud: citycloud
+  - name: limestone-regionone
+    region-name: 'RegionOne'
+    cloud: limestone
     boot-timeout: 120
-    launch-timeout: 600
-    clean-floating-ips: true
-    rate: 0.25
+    launch-timeout: 300
+    rate: 0.01
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
@@ -78,116 +77,6 @@ providers:
         config-drive: true
       - name: ubuntu-xenial
         config-drive: true
-    pools:
-      - name: main
-        # Disabled until 2018-07-01 at request of citycloud.
-        # We should contact them before reenabling at this date.
-        max-servers: 0
-        availability-zones:
-          - nova
-        labels: &provider_pools_labels
-          - name: centos-7
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: centos-7
-            key-name: infra-root-keys-2018-06-15
-          - name: centos-8
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: centos-8
-            key-name: infra-root-keys-2018-06-15
-          - name: debian-buster
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: debian-buster
-            key-name: infra-root-keys-2018-06-15
-          - name: debian-stretch
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: debian-stretch
-            key-name: infra-root-keys-2018-06-15
-          - name: fedora-30
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: fedora-30
-            key-name: infra-root-keys-2018-06-15
-          - name: fedora-31
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: fedora-31
-            key-name: infra-root-keys-2018-06-15
-          - name: gentoo-17-0-systemd
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: gentoo-17-0-systemd
-            key-name: infra-root-keys-2018-06-15
-          - name: opensuse-15
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: opensuse-15
-            key-name: infra-root-keys-2018-06-15
-          - name: opensuse-tumbleweed
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: opensuse-tumbleweed
-            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-bionic
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: ubuntu-bionic
-            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-focal
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: ubuntu-focal
-            key-name: infra-root-keys-2018-06-15
-          - name: ubuntu-xenial
-            min-ram: 8000
-            flavor-name: '8C-8GB-100GB'
-            diskimage: ubuntu-xenial
-            key-name: infra-root-keys-2018-06-15
-
-  - name: citycloud-lon1
-    region-name: 'Lon1'
-    cloud: citycloud
-    boot-timeout: 120
-    launch-timeout: 600
-    clean-floating-ips: true
-    rate: 0.25
-    diskimages: *provider_diskimages
-    pools:
-      - name: main
-        # Disabled until 2018-07-01 at request of citycloud.
-        # We should contact them before reenabling at this date.
-        max-servers: 0
-        availability-zones:
-          - nova
-        labels: *provider_pools_labels
-
-  - name: citycloud-sto2
-    region-name: 'Sto2'
-    cloud: citycloud
-    boot-timeout: 120
-    launch-timeout: 600
-    clean-floating-ips: true
-    rate: 0.25
-    diskimages: *provider_diskimages
-    pools:
-      - name: main
-        # Disabled until 2018-07-01 at request of citycloud.
-        # We should contact them before reenabling at this date.
-        max-servers: 0
-        availability-zones:
-          - nova
-        labels: *provider_pools_labels
-
-  - name: limestone-regionone
-    region-name: 'RegionOne'
-    cloud: limestone
-    boot-timeout: 120
-    launch-timeout: 300
-    rate: 0.01
-    diskimages: *provider_diskimages
     pools:
       - name: main
         max-servers: 50
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index a606223ca6..5c0568e145 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -10,26 +10,6 @@ zookeeper-servers:
     port: 2181
 
 providers:
-  - name: citycloud-kna1
-    region-name: 'Kna1'
-    cloud: citycloud
-    rate: 0.25
-    # Disabled until 2018-07-01 at request of citycloud.
-    # We should contact them before reenabling at this date.
-    diskimages: []
-
-  - name: citycloud-lon1
-    region-name: 'Lon1'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: []
-
-  - name: citycloud-sto2
-    region-name: 'Sto2'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: []
-
   - name: ovh-bhs1
     region-name: 'BHS1'
     cloud: ovh