diff --git a/inventory/inventory b/inventory/inventory
index 9f9b3356cf..11ca076cb4 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -762,8 +762,6 @@ bastion02.phx2.fedoraproject.org
 certgetter01.iad2.fedoraproject.org
 # download01.phx2.fedoraproject.org
 log01.phx2.fedoraproject.org
-kojipkgs01.phx2.fedoraproject.org
-kojipkgs02.phx2.fedoraproject.org
 ns03.phx2.fedoraproject.org
 ns04.phx2.fedoraproject.org
 db-qa01.qa.fedoraproject.org
diff --git a/roles/kojipkgs/files/squid.conf b/roles/kojipkgs/files/squid.conf
index b9c86c9568..9fb08a86ea 100644
--- a/roles/kojipkgs/files/squid.conf
+++ b/roles/kojipkgs/files/squid.conf
@@ -35,7 +35,7 @@ acl SSL_ports port 443
 acl Safe_ports port 80		# http
 acl Safe_ports port 443		# https
 acl CONNECT method CONNECT
-acl our_sites dstdomain kojipkgs.fedoraproject.org kojipkgs01.fedoraproject.org kojipkgs02.fedoraproject.org kojipkgs01.phx2.fedoraproject.org kojipkgs02.phx2.fedoraproject.org
+acl our_sites dstdomain kojipkgs.fedoraproject.org kojipkgs01.fedoraproject.org kojipkgs02.fedoraproject.org kojipkgs01.iad2.fedoraproject.org kojipkgs02.iad2.fedoraproject.org
 acl phx2 src 10.5.125.0/24 10.5.127.0/24 10.5.129.0/24
 # The stg builders in the createrepo channel need access to repos
 acl phx2-stg src 10.5.128.84/32 10.5.128.85/32 10.5.128.86/32 10.5.128.87/32 10.5.128.69/32
diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg
index 5be7264ade..9e1e317e4a 100644
--- a/roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg
+++ b/roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg
@@ -1,5 +1,5 @@
 define service {
-  host_name             rawhide-composer.iad2.fedoraproject.org, koji01.phx2.fedoraproject.org
+  host_name             rawhide-composer.iad2.fedoraproject.org, koji01.iad2.fedoraproject.org
   service_description   Check NFS File Locks
   check_command         check_by_nrpe!check_lock
   use                   criticaltemplate
diff --git a/roles/pdc/backend/templates/pdcupdater.py b/roles/pdc/backend/templates/pdcupdater.py
index c9568baddb..73bd223b3d 100644
--- a/roles/pdc/backend/templates/pdcupdater.py
+++ b/roles/pdc/backend/templates/pdcupdater.py
@@ -16,10 +16,10 @@ config = {
     # Credentials to talk to PDC
     'pdcupdater.pdc': {
         {% if env == 'staging' %}
-        'server': 'http://pdc-web01.stg.phx2.fedoraproject.org/rest_api/v1/',
+        'server': 'http://pdc-web01.stg.iad2.fedoraproject.org/rest_api/v1/',
         'token': '{{pdc_updater_api_token_stg }}',
         {% else %}
-        'server': 'http://pdc-web01.phx2.fedoraproject.org/rest_api/v1/',
+        'server': 'http://pdc-web01.iad2.fedoraproject.org/rest_api/v1/',
         'token': '{{pdc_updater_api_token_prod }}',
         {% endif %}
     },
@@ -53,7 +53,7 @@ config = {
     {% if env == 'staging' %}
     'pdcupdater.koji_url': 'https://koji.stg.fedoraproject.org/kojihub',
     {% else %}
-    'pdcupdater.koji_url': 'http://koji01.phx2.fedoraproject.org/kojihub',
+    'pdcupdater.koji_url': 'http://koji01.iad2.fedoraproject.org/kojihub',
     {% endif %}
     # Use 8 threads to talk to koji in parallel.
     'pdcupdater.koji_io_threads': 8,
diff --git a/roles/varnish/templates/s390kojipkgs.vcl.j2 b/roles/varnish/templates/s390kojipkgs.vcl.j2
index 9f8d120979..50df90ee91 100644
--- a/roles/varnish/templates/s390kojipkgs.vcl.j2
+++ b/roles/varnish/templates/s390kojipkgs.vcl.j2
@@ -16,7 +16,7 @@ acl purge {
 
 {% if env == 'staging' %}
 backend koji01 {
-    .host = "koji01.stg.phx2.fedoraproject.org";
+    .host = "koji01.stg.iad2.fedoraproject.org";
     .probe = {
         .url = "/work/";
         .timeout = 3600s;
@@ -30,7 +30,7 @@ backend koji01 {
 }
 {% else %}
 backend kojipkgs01 {
-    .host = "kojipkgs01.phx2.fedoraproject.org";
+    .host = "kojipkgs01.iad2.fedoraproject.org";
     .probe = {
         .url = "/";
         .timeout = 3600s;
@@ -44,7 +44,7 @@ backend kojipkgs01 {
 }
 
 backend kojipkgs02 {
-    .host = "kojipkgs02.phx2.fedoraproject.org";
+    .host = "kojipkgs02.iad2.fedoraproject.org";
     .probe = {
         .url = "/";
         .timeout = 3600s;