diff --git a/hiera/common.yaml b/hiera/common.yaml
index a4f711286f..b9f2745372 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -273,10 +273,6 @@ cacti_hosts:
 - mirror01.dfw.rax.opendev.org
 - mirror01.ord.rax.opendev.org
 - mirror01.iad.rax.opendev.org
-- mirror01.kna1.citycloud.openstack.org
-- mirror01.sto2.citycloud.openstack.org
-- mirror01.la1.citycloud.openstack.org
-- mirror01.lon1.citycloud.openstack.org
 - mirror01.ca-ymq-1.vexxhost.openstack.org
 - mirror02.ca-ymq-1.vexxhost.openstack.org
 - mirror02.regionone.limestone.openstack.org
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index 9db24f012d..b8963df09e 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -459,20 +459,6 @@ all:
         region_name: IAD
       public_v4: 104.130.4.72
       public_v6: 2001:4802:7802:104:be76:4eff:fe20:145a
-    mirror01.kna1.citycloud.openstack.org:
-      ansible_host: 91.123.202.253
-      location:
-        cloud: openstackci-citycloud
-        region_name: Kna1
-      public_v4: 91.123.202.253
-      public_v6: ''
-    mirror01.lon1.citycloud.openstack.org:
-      ansible_host: 37.153.172.158
-      location:
-        cloud: openstackci-citycloud
-        region_name: Lon1
-      public_v4: 37.153.172.158
-      public_v6: ''
     mirror01.london.linaro-london.openstack.org:
       ansible_host: 213.146.141.37
       location:
diff --git a/playbooks/host_vars/bridge.openstack.org.yaml b/playbooks/host_vars/bridge.openstack.org.yaml
index 7572f89b4f..907d24fc3c 100644
--- a/playbooks/host_vars/bridge.openstack.org.yaml
+++ b/playbooks/host_vars/bridge.openstack.org.yaml
@@ -255,80 +255,6 @@ cloud_launcher_clouds:
     profiles:
       - openstackci-keypairs
 
-  # Citycloud
-  - name: openstackci-citycloud-Lon1
-    oscc_cloud: openstackci-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Lon1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
-  - name: openstackci-citycloud-Kna1
-    oscc_cloud: openstackci-citycloud
-    region_name: Kna1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Kna1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Kna1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
-  - name: openstackci-citycloud-Sto2
-    oscc_cloud: openstackci-citycloud
-    region_name: Sto2
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Sto2
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Sto2
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
-
   # Linaro
   - name: openstackci-linaro-london
     oscc_cloud: openstackci-linaro-london
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index af3b36ded6..9c543aaa56 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -129,38 +129,6 @@ clouds:
       project_name: '{{ clouds.openstackci_vexxhost_project_name }}'
       project_domain_name: default
       user_domain_name: default
-  openstackci-citycloud:
-    regions:
-      - Kna1
-      - La1
-      - Lon1
-      - Sto2
-    profile: citycloud
-    auth:
-      # TODO(mordred) This auth_url entry is only needed until openstacksdk
-      # 0.18.2 or 0.19.0 is released.
-      auth_url: "https://{region_name}.citycloud.com:5000/v3/"
-      username: '{{ clouds.openstackci_citycloud_username }}'
-      password: '{{ clouds.openstackci_citycloud_password }}'
-      project_name: 'Default Project 27611'
-      project_domain_name: CCP_Domain_27611
-      user_domain_name: CCP_Domain_27611
-  openstackzuul-citycloud:
-    regions:
-      - Kna1
-      - La1
-      - Lon1
-      - Sto2
-    profile: citycloud
-    auth:
-      # TODO(mordred) This auth_url entry is only needed until openstacksdk
-      # 0.18.2 or 0.19.0 is released.
-      auth_url: "https://{region_name}.citycloud.com:5000/v3/"
-      username: '{{ clouds.openstackzuul_citycloud_username }}'
-      password: '{{ clouds.openstackzuul_citycloud_password }}'
-      project_name: 'OpenStack CI Project'
-      project_domain_name: 'CCP_Domain_27611'
-      user_domain_name: 'CCP_Domain_27611'
   openstackci-linaro-london:
     regions:
       - London
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 45fb9d20a7..0b7bfe6a91 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -78,23 +78,6 @@ clouds:
       user_domain_name: default
     image_format: 'raw'
     force_ipv4: true
-  citycloud:
-    regions:
-      - Lon1
-      - Kna1
-      - La1
-      - Sto2
-    profile: citycloud
-    api_timeout: 60
-    auth:
-      # TODO(mordred) This auth_url entry is only needed until openstacksdk
-      # 0.18.2 or 0.19.0 is released.
-      auth_url: "https://{region_name}.citycloud.com:5000/v3/"
-      username: '{{ nodepool_citycloud_username }}'
-      password: '{{ nodepool_citycloud_password }}'
-      project_name: 'OpenStack CI Project'
-      project_domain_name: CCP_Domain_27611
-      user_domain_name: CCP_Domain_27611
   linaro-london:
     regions:
       - London
diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
index 30f659be48..c5a2eacd65 100644
--- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
@@ -24,10 +24,6 @@ clouds:
   openstackci_vexxhost_username: user
   openstackci_vexxhost_password: password
   openstackci_vexxhost_project_name: project
-  openstackci_citycloud_username: user
-  openstackci_citycloud_password: password
-  openstackzuul_citycloud_username: user
-  openstackzuul_citycloud_password: password
   openstackci_linaro_london_username: user
   openstackci_linaro_london_password: password
   openstackci_linaro_london_project_name: project