diff --git a/files/communishift/objects/machineconfigs/mc_chrony.yml.template b/files/communishift/objects/machineconfigs/mc_chrony.yml.template
index de69b39bc5..7ef78dc2bc 100644
--- a/files/communishift/objects/machineconfigs/mc_chrony.yml.template
+++ b/files/communishift/objects/machineconfigs/mc_chrony.yml.template
@@ -12,7 +12,7 @@ spec:
     storage:
       files:
       - contents:
-          source: "data:,server%20cloud-noc01.cloud.fedoraproject.org%20port%20124"
+          source: "data:,server%20cloud-noc01.fedorainfracloud.org%20port%20124"
           verification: {}
         filesystem: root
         mode: 0644
diff --git a/inventory/group_vars/newcloud b/inventory/group_vars/newcloud
index 7c44caf35c..9aca60028b 100644
--- a/inventory/group_vars/newcloud
+++ b/inventory/group_vars/newcloud
@@ -9,7 +9,7 @@ dns: 8.8.8.8
 freezes: false
 ansible_ifcfg_whitelist: ['eth1']
 baseiptables: false
-ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q cloud-noc01.cloud.fedoraproject.org"'
+ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q cloud-noc01.fedorainfracloud.org"'
 nagios_Check_Services:
   mail: false
   nrpe: false
diff --git a/inventory/host_vars/cloud-noc01.cloud.fedoraproject.org b/inventory/host_vars/cloud-noc01.fedorainfracloud.org
similarity index 96%
rename from inventory/host_vars/cloud-noc01.cloud.fedoraproject.org
rename to inventory/host_vars/cloud-noc01.fedorainfracloud.org
index 3342cd0f5f..34191ea5cc 100644
--- a/inventory/host_vars/cloud-noc01.cloud.fedoraproject.org
+++ b/inventory/host_vars/cloud-noc01.fedorainfracloud.org
@@ -9,7 +9,7 @@ gw: 38.145.49.254
 nm: 255.255.254.0
 eth1_ip: 172.23.1.1
 freezes: false
-resolvconf: "{{ files }}/resolv.conf/cloud-noc01.cloud.fedoraproject.org"
+resolvconf: "{{ files }}/resolv.conf/cloud-noc01.fedorainfracloud.org"
 
 vmhost: virthost-cloud01.fedorainfracloud.org
 volgroup: /dev/vg_guests
diff --git a/master.yml b/master.yml
index 8fd1381b55..82bc0d9565 100644
--- a/master.yml
+++ b/master.yml
@@ -112,7 +112,7 @@
 # host playbooks
 #
 
-- import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
+- import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/grobisplitter01.phx2.fedoraproject.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml
diff --git a/roles/base/files/resolv.conf/cloud-noc01.cloud.fedoraproject.org b/roles/base/files/resolv.conf/cloud-noc01.fedorainfracloud.org
similarity index 100%
rename from roles/base/files/resolv.conf/cloud-noc01.cloud.fedoraproject.org
rename to roles/base/files/resolv.conf/cloud-noc01.fedorainfracloud.org
diff --git a/roles/chrony/templates/chrony.conf.j2 b/roles/chrony/templates/chrony.conf.j2
index 8e58f650d2..cbae3e2537 100644
--- a/roles/chrony/templates/chrony.conf.j2
+++ b/roles/chrony/templates/chrony.conf.j2
@@ -3,7 +3,7 @@
 server bastion01.phx2.fedoraproject.org iburst
 server bastion02.phx2.fedoraproject.org iburst
 {% elif datacenter == 'cloud'  and not ansible_hostname.startswith('cloud-noc') %}
-server cloud-noc01.cloud.fedoraproject.org port 124
+server cloud-noc01.fedorainfracloud.org port 124
 {% elif datacenter == 'cloud'  and ansible_hostname.startswith('cloud-noc') %}
 server 0.rhel.pool.ntp.org iburst
 server 1.rhel.pool.ntp.org iburst
diff --git a/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.fedorainfracloud.org
similarity index 99%
rename from roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org
rename to roles/dhcp_server/files/dhcpd.conf.cloud-noc01.fedorainfracloud.org
index 6922ba49b9..b18d605dc0 100644
--- a/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.fedorainfracloud.org
@@ -1,4 +1,4 @@
-server-identifier cloud-noc01.cloud.fedoraproject.org;
+server-identifier cloud-noc01.fedorainfracloud.org;
 ddns-update-style none;
 
 #subnet 172.16.1.0 netmask 255.255.255.0 {
diff --git a/roles/ntp/templates/ntp.conf.j2 b/roles/ntp/templates/ntp.conf.j2
index 959160edaf..297e3c6c96 100644
--- a/roles/ntp/templates/ntp.conf.j2
+++ b/roles/ntp/templates/ntp.conf.j2
@@ -15,7 +15,7 @@ restrict -6 ::1
 server 10.5.126.12
 server 10.5.126.11
 {% elif datacenter == 'cloud' and not inventory_hostanem.startswith('cloud-noc01') %}
-server cloud-noc01.cloud.fedoraproject.org
+server cloud-noc01.fedorainfracloud.org
 {% else %}
 server 1.rhel.pool.ntp.org
 server 2.rhel.pool.ntp.org
diff --git a/roles/tftp_server/files/default.cloud-noc01.cloud.fedoraproject.org b/roles/tftp_server/files/default.cloud-noc01.fedorainfracloud.org
similarity index 100%
rename from roles/tftp_server/files/default.cloud-noc01.cloud.fedoraproject.org
rename to roles/tftp_server/files/default.cloud-noc01.fedorainfracloud.org
diff --git a/roles/tftp_server/files/highbank.cloud-noc01.cloud.fedoraproject.org b/roles/tftp_server/files/highbank.cloud-noc01.fedorainfracloud.org
similarity index 100%
rename from roles/tftp_server/files/highbank.cloud-noc01.cloud.fedoraproject.org
rename to roles/tftp_server/files/highbank.cloud-noc01.fedorainfracloud.org