diff --git a/hiera/common.yaml b/hiera/common.yaml
index 1610c2e808..f486d15a6f 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -451,7 +451,6 @@ cacti_hosts:
 - mirror.ord.rax.openstack.org
 - mirror.regionone.infracloud-chocolate.openstack.org
 - mirror.regionone.infracloud-vanilla.openstack.org
-- mirror.regionone.osic-cloud1.openstack.org
 - mirror.regionone.tripleo-test-cloud-rh1.openstack.org
 - mirror.regionone.tripleo-test-cloud-rh2.openstack.org
 - mirror.sto2.citycloud.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 7743292446..140ba016ca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -807,12 +807,6 @@ node 'nodepool.openstack.org' {
   $infracloud_chocolate_username  = hiera('nodepool_infracloud_chocolate_username', 'username')
   $infracloud_chocolate_password  = hiera('nodepool_infracloud_chocolate_password')
   $infracloud_chocolate_project   = hiera('nodepool_infracloud_chocolate_project', 'project')
-  $osic_cloud1_username           = hiera('nodepool_osic_cloud1_username', 'username')
-  $osic_cloud1_password           = hiera('nodepool_osic_cloud1_password')
-  $osic_cloud1_project            = hiera('nodepool_osic_cloud1_project', 'project')
-  $osic_cloud8_username           = hiera('nodepool_osic_cloud8_username', 'username')
-  $osic_cloud8_password           = hiera('nodepool_osic_cloud8_password')
-  $osic_cloud8_project            = hiera('nodepool_osic_cloud8_project', 'project')
   $vexxhost_username   = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password   = hiera('nodepool_vexxhost_password')
   $vexxhost_project    = hiera('nodepool_vexxhost_project', 'project')
@@ -920,12 +914,6 @@ node /^nl\d+\.openstack\.org$/ {
   $infracloud_chocolate_username  = hiera('nodepool_infracloud_chocolate_username', 'username')
   $infracloud_chocolate_password  = hiera('nodepool_infracloud_chocolate_password')
   $infracloud_chocolate_project   = hiera('nodepool_infracloud_chocolate_project', 'project')
-  $osic_cloud1_username           = hiera('nodepool_osic_cloud1_username', 'username')
-  $osic_cloud1_password           = hiera('nodepool_osic_cloud1_password')
-  $osic_cloud1_project            = hiera('nodepool_osic_cloud1_project', 'project')
-  $osic_cloud8_username           = hiera('nodepool_osic_cloud8_username', 'username')
-  $osic_cloud8_password           = hiera('nodepool_osic_cloud8_password')
-  $osic_cloud8_project            = hiera('nodepool_osic_cloud8_project', 'project')
   $vexxhost_username              = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password              = hiera('nodepool_vexxhost_password')
   $vexxhost_project               = hiera('nodepool_vexxhost_project', 'project')
@@ -999,12 +987,6 @@ node /^nb\d+\.openstack\.org$/ {
   $infracloud_chocolate_username  = hiera('nodepool_infracloud_chocolate_username', 'username')
   $infracloud_chocolate_password  = hiera('nodepool_infracloud_chocolate_password')
   $infracloud_chocolate_project   = hiera('nodepool_infracloud_chocolate_project', 'project')
-  $osic_cloud1_username           = hiera('nodepool_osic_cloud1_username', 'username')
-  $osic_cloud1_password           = hiera('nodepool_osic_cloud1_password')
-  $osic_cloud1_project            = hiera('nodepool_osic_cloud1_project', 'project')
-  $osic_cloud8_username           = hiera('nodepool_osic_cloud8_username', 'username')
-  $osic_cloud8_password           = hiera('nodepool_osic_cloud8_password')
-  $osic_cloud8_project            = hiera('nodepool_osic_cloud8_project', 'project')
   $vexxhost_username   = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password   = hiera('nodepool_vexxhost_password')
   $vexxhost_project    = hiera('nodepool_vexxhost_project', 'project')
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index eaafd0f577..3cdf959356 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -61,42 +61,6 @@ clouds:
               routes_externally: True
             - name: inap-17304-LAN3326
               routes_externally: False
-  osic-cloud1:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud1.osic.xyz:5000
-      username: <%= @osic_cloud1_username %>
-      password: <%= @osic_cloud1_password %>
-      project_name: <%= @osic_cloud1_project %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: GATEWAY_NET
-        routes_externally: true
-      - name: GATEWAY_NET_V6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
-  osic-cloud8:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud8.weareopenstack.org:9007
-      username: <%= @osic_cloud8_username %>
-      password: <%= @osic_cloud8_password %>
-      project_name: <%= @osic_cloud8_project %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: external-v4
-        routes_externally: true
-      - name: external-v6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
   vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index ee32a42080..bc599ba5b0 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -191,78 +191,6 @@ clouds:
       user_domain_name: default
     floating_ip_source: neutron
     identity_api_version: '3'
-  openstackjenkins-osic-cloud1:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud1.osic.xyz:5000
-      username: <%= @puppetmaster_clouds['openstackjenkins_osic_cloud1_username'] %>
-      password: <%= @puppetmaster_clouds['openstackjenkins_osic_cloud1_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_cloud1_project_name'] %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: GATEWAY_NET
-        routes_externally: true
-      - name: GATEWAY_NET_V6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
-  openstackci-osic-cloud1:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud1.osic.xyz:5000
-      username: <%= @puppetmaster_clouds['openstackci_osic_cloud1_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_osic_cloud1_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud1_project_name'] %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: GATEWAY_NET
-        routes_externally: true
-      - name: GATEWAY_NET_V6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
-  openstackci-osic-cloud8:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud8.weareopenstack.org:9007
-      username: <%= @puppetmaster_clouds['openstackci_osic_cloud8_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_osic_cloud8_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud8_project_name'] %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: external-v4
-        routes_externally: true
-      - name: external-v6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
-  openstackzuul-osic-cloud8:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud8.weareopenstack.org:9007
-      username: <%= @puppetmaster_clouds['openstackzuul_osic_cloud8_username'] %>
-      password: <%= @puppetmaster_clouds['openstackzuul_osic_cloud8_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackzuul_osic_cloud8_project_name'] %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: external-v4
-        routes_externally: true
-      - name: external-v6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
   openstackjenkins-vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 6883e65c15..751a576d39 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -49,42 +49,6 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
       project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
-  openstackci-osic-cloud1:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud1.osic.xyz:5000
-      username: <%= @puppetmaster_clouds['openstackci_osic_cloud1_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_osic_cloud1_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud1_project_name'] %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: GATEWAY_NET
-        routes_externally: true
-      - name: GATEWAY_NET_V6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
-  openstackci-osic-cloud8:
-    region_name: RegionOne
-    auth:
-      auth_url: https://cloud8.weareopenstack.org:9007
-      username: <%= @puppetmaster_clouds['openstackci_osic_cloud8_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_osic_cloud8_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud8_project_name'] %>
-      project_domain_name: default
-      user_domain_name: default
-    networks:
-      - name: external-v4
-        routes_externally: true
-      - name: external-v6
-        routes_externally: true
-        routes_ipv6_externally: true
-        routes_ipv4_externally: false
-    identity_api_version: '3'
-    floating_ip_source: None
   openstackci-vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost
diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml
index bdb042ed39..8b48fedbf7 100644
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@@ -113,17 +113,6 @@ profiles:
         cidr: '10.0.1.0/24'
 
 clouds:
-  # osic-cloud1
-  - name: openstackci-osic-cloud1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-  - name: openstackjenkins-osic-cloud1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
   # ovh
   - name: openstackci-ovh-bhs1
     oscc_cloud: openstackci-ovh