diff --git a/hiera/common.yaml b/hiera/common.yaml
index 489f8a2772..ea125d4270 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -454,7 +454,7 @@ cacti_hosts:
 - mirror01.ca-ymq-1.vexxhost.openstack.org
 - mirror.bhs1.ovh.openstack.org
 - mirror.gra1.ovh.openstack.org
-- mirror.mtl01.internap.openstack.org
+- mirror.mtl01.inap.openstack.org
 - mirror.regionone.tripleo-test-cloud-rh1.openstack.org
 - mirror.regionone.tripleo-test-cloud-rh2.openstack.org
 - mirror-update.openstack.org
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 2dfe338405..1ffda91ffa 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -42,25 +42,6 @@ clouds:
       project_name: '<%= @tripleo_project %>'
       auth_url: 'https://ci-overcloud.rh2.tripleo.org:13000/v2.0'
     floating_ip_source: neutron
-  internap:
-    profile: internap
-    auth:
-      username: '<%= @internap_username %>'
-      password: '<%= @internap_password %>'
-      project_name: '<%= @internap_project %>'
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17304-WAN1101
-              routes_externally: True
-      - name: nyj01
-        values:
-          networks:
-            - name: inap-17304-WAN2342
-              routes_externally: True
-            - name: inap-17304-LAN3326
-              routes_externally: False
   inap:
     profile: internap
     auth:
diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
index 0a7aca358b..ff52f757f5 100644
--- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
@@ -10,7 +10,7 @@ keys=root,nodepool,requests,shade,image,kazoo,
  dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7,
  dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423,
  rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload,
- ovh-bhs1_upload, internap-mtl01_upload,
+ ovh-bhs1_upload, inap-mtl01_upload,
  tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload,
  infracloud-chocolate_upload, citycloud-lon1_upload,
  citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload
@@ -20,7 +20,7 @@ keys=console,debug,normal,image,
  dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7,
  dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423,
  rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload,
- ovh-bhs1_upload, internap-mtl01_upload,
+ ovh-bhs1_upload, inap-mtl01_upload,
  tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload,
  infracloud-chocolate_upload, citycloud-lon1_upload,
  citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload
@@ -246,17 +246,17 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @upload_log_document_root %>/ovh-bhs1.log', 'H', 8, 30,)
 
-[logger_internap-mtl01_upload]
+[logger_inap-mtl01_upload]
 level=DEBUG
-handlers=internap-mtl01_upload
-qualname=nodepool.image.upload.internap-mtl01
+handlers=inap-mtl01_upload
+qualname=nodepool.image.upload.inap-mtl01
 propagate=0
 
-[handler_internap-mtl01_upload]
+[handler_inap-mtl01_upload]
 level=DEBUG
 class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
-args=('<%= @upload_log_document_root %>/internap-mtl01.log', 'H', 8, 30,)
+args=('<%= @upload_log_document_root %>/inap-mtl01.log', 'H', 8, 30,)
 
 [logger_tripleo-test-cloud-rh1_upload]
 level=DEBUG
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index c6a0cd7cf3..d17044d222 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -59,25 +59,6 @@ clouds:
     identity_api_version: '3'
     floating_ip_source: None
     cacert: /etc/openstack/infracloud_chocolate_cacert.pem
-  openstackci-internap:
-    profile: internap
-    auth:
-      username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17301-WAN1102
-              routes_externally: True
-      - name: nyj01
-        values:
-          networks:
-            - name: inap-17301-WAN2344
-              routes_externally: True
-            - name: inap-17301-LAN3328
-              routes_externally: False
   openstackci-inap:
     profile: internap
     auth:
@@ -90,25 +71,6 @@ clouds:
           networks:
             - name: inap-17301-WAN1102
               routes_externally: True
-  openstackjenkins-internap:
-    profile: internap
-    auth:
-      username: <%= @puppetmaster_clouds['openstackjenkins_internap_username'] %>
-      password: <%= @puppetmaster_clouds['openstackjenkins_internap_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %>
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17304-WAN1101
-              routes_externally: True
-      - name: nyj01
-        values:
-          networks:
-            - name: inap-17304-WAN2342
-              routes_externally: True
-            - name: inap-17304-LAN3326
-              routes_externally: False
   openstackjenkins-inap:
     profile: internap
     auth:
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 5de9169b62..f91f87ee71 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -10,25 +10,6 @@ cache:
     port: 5
     floating-ip: 5
 clouds:
-  openstackci-internap:
-    profile: internap
-    auth:
-      username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17301-WAN1102
-              routes_externally: True
-      - name: nyj01
-        values:
-          networks:
-            - name: inap-17301-WAN2344
-              routes_externally: True
-            - name: inap-17301-LAN3328
-              routes_externally: False
   openstackci-inap:
     profile: internap
     auth:
diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml
index 3c693a580d..7f6f0ccc41 100644
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@@ -139,19 +139,6 @@ clouds:
       - openstackci-keypairs
       - openstackci-security
 
-  # internap
-  - name: openstackci-internap-mtl01
-    oscc_cloud: openstackci-internap
-    region_name: mtl01
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-  - name: openstackjenkins-internap-mtl01
-    oscc_cloud: openstackjenkins-internap
-    region_name: mtl01
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
   # inap
   - name: openstackci-inap-mtl01
     oscc_cloud: openstackci-inap