diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index 6e73a6216b..e08db66a1a 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -66,7 +66,7 @@
   - mirrormanager/crawler
   - { role: rsyncd,
       when: env != "staging" }
-  - { role: openvpn/client, when: datacenter != "phx2" }
+  - { role: openvpn/client, when: datacenter != "iad2" }
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg
index dc238e41a5..09cd7f571c 100644
--- a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg
+++ b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg
@@ -13,7 +13,7 @@ callback = "mirror_from_pagure_bus:MirrorFromPagure"
 queue = "mirror_pagure_ansible{{ env_suffix }}"
 {% elif inventory_hostname.startswith('batcave01.iad2') %}
 queue = "mirror_pagure_ansible{{ env_suffix }}_iad2"
-{% elif inventory_hostname.startswith('batcave13.phx2') %}
+{% elif inventory_hostname.startswith('batcave13.') %}
 queue = "mirror_pagure_ansible{{ env_suffix }}_13"
 {% endif %}
 exchange = "amq.topic"
diff --git a/roles/mirrormanager/backend/templates/handle_propagation.sh b/roles/mirrormanager/backend/templates/handle_propagation.sh
index a3b2209b0c..efb2675f87 100644
--- a/roles/mirrormanager/backend/templates/handle_propagation.sh
+++ b/roles/mirrormanager/backend/templates/handle_propagation.sh
@@ -2,7 +2,7 @@
 
 URL="https://pdc.fedoraproject.org/rest_api/v1/releases/?active=True&name=Fedora"
 PROPAGATION="/usr/bin/mm2_propagation"
-SOURCE="mm-crawler01.phx2.fedoraproject.org::propagation"
+SOURCE="mm-crawler01.iad2.fedoraproject.org::propagation"
 LOGBASE="/var/log/mirrormanager/propagation"
 
 FRONTENDS="{% for host in groups['mm_frontend'] %} {{ host }} {% endfor %}"
diff --git a/roles/mirrormanager/crawler/tasks/main.yml b/roles/mirrormanager/crawler/tasks/main.yml
index ab3e6da321..3c2006bb8c 100644
--- a/roles/mirrormanager/crawler/tasks/main.yml
+++ b/roles/mirrormanager/crawler/tasks/main.yml
@@ -50,4 +50,4 @@
   cron: name="propagation-check" minute="27" hour="*/2" user="mirrormanager"
         job="/usr/local/bin/check_propagation.sh"
         cron_file=propagation-check
-  when: inventory_hostname.startswith('mm-crawler01.phx2')
+  when: inventory_hostname.startswith('mm-crawler01.iad2')
diff --git a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
index 0b483dd2d2..aa4b54e20c 100644
--- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
@@ -88,7 +88,7 @@
   file: dest="{{item}}" owner=mirrormanager group=mirrormanager mode=0755 state=touch
   with_items:
   - /var/log/mirrormanager/mirrorlist3.service.log
-  when: datacenter == 'phx2'
+  when: datacenter == 'iad2'
   tags:
   - mirrorlist_proxy
 
@@ -96,7 +96,7 @@
   file: dest="{{item}}" owner=mirrormanager group=mirrormanager
   with_items:
   - /var/log/mirrormanager/mirrorlist3.service.log
-  when: datacenter == 'phx2'
+  when: datacenter == 'iad2'
   tags:
   - mirrorlist_proxy
 
@@ -155,7 +155,7 @@
   - mirrorlist_proxy
   notify:
   - reload systemd
-  when: datacenter == 'phx2'
+  when: datacenter == 'iad2'
 
 # enable both of them to run on boot
 - name: Enable mirrorlist1
@@ -172,7 +172,7 @@
   service: name=mirrorlist3 enabled=yes
   tags:
   - mirrorlist_proxy
-  when: datacenter == 'phx2'
+  when: datacenter == 'iad2'
 
 # install our cron script to handle hourly new protbuf cache changes.
 - name: install script to restart mirrorlist containers on protobuf cache changes
diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/restart-mirrorlist-containers.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/restart-mirrorlist-containers.j2
index b01a267a6c..6435304464 100644
--- a/roles/mirrormanager/mirrorlist_proxy/templates/restart-mirrorlist-containers.j2
+++ b/roles/mirrormanager/mirrorlist_proxy/templates/restart-mirrorlist-containers.j2
@@ -10,7 +10,7 @@
 ## Docker ports for mirrors
 mirrorlist1="http://localhost:18081/metalink?repo=rawhide&arch=x86_64"
 mirrorlist2="http://localhost:18082/metalink?repo=rawhide&arch=x86_64"
-{% if datacenter == 'phx2' %}
+{% if datacenter == 'iad2' %}
 mirrorlist3="http://localhost:18083/metalink?repo=rawhide&arch=x86_64"
 {% endif %}
 
@@ -27,7 +27,7 @@ then
 	cp /srv/mirrorlist/data/mirrorlist1/* /srv/mirrorlist/data/mirrorlist2/
 fi
 
-{% if datacenter == 'phx2' %}
+{% if datacenter == 'iad2' %}
 # We have more mirror containers here
 if [ ! -f /srv/mirrorlist/data/mirrorlist3/global_netblocks.txt ];
 then
@@ -58,7 +58,7 @@ if [ $? != 0 ]; then
 	exit 1
 fi
 
-{% if datacenter == 'phx2' %}
+{% if datacenter == 'iad2' %}
 # check mirrorlist3 (old protbuf cache and see that it's processing ok)
 curl -q -H mirrors.fedoraproject.org ${mirrorlist3} -s -f --retry 50 --retry-delay 10 --retry-connrefused --retry-max-time 180 | grep "sha512" >/dev/null
 if [ $? != 0 ]; then
@@ -131,7 +131,7 @@ fi
 
 echo "enable server mirror-lists-backend/mirrorlist-local2" | nc -U /var/run/haproxy-admin >& /dev/null
 
-{% if datacenter == 'phx2' %}
+{% if datacenter == 'iad2' %}
 # copy new protbuf cache to mirrorlist3
 cp -a /srv/mirrorlist/data/mirrorlist1/* /srv/mirrorlist/data/mirrorlist3/