diff --git a/inventory/host_vars/download-rdu01.fedoraproject.org b/inventory/host_vars/download-rdu01.fedoraproject.org
index 11a5061766..9a497c0536 100644
--- a/inventory/host_vars/download-rdu01.fedoraproject.org
+++ b/inventory/host_vars/download-rdu01.fedoraproject.org
@@ -2,13 +2,13 @@
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 datacenter: rdu
-nm: 255.255.255.192
-gw: 204.85.14.62
+nm: 255.255.255.0
+gw: 172.31.2.254
 dns: 8.8.8.8
 postfix_group: vpn
 vpn: true
-eth0_ip: 204.85.14.1
-eth0_nm: 255.255.255.192
+eth0_ip: 172.31.2.31
+eth0_nm: 255.255.255.0
 eth1_ip: 172.31.1.1
 eth1_nm: 255.255.255.0
 
diff --git a/inventory/host_vars/proxy13.fedoraproject.org b/inventory/host_vars/proxy13.fedoraproject.org
index 1506c1308b..743106aa82 100644
--- a/inventory/host_vars/proxy13.fedoraproject.org
+++ b/inventory/host_vars/proxy13.fedoraproject.org
@@ -1,6 +1,6 @@
 ---
-nm: 255.255.255.192
-gw: 204.85.14.62
+nm: 255.255.255.0
+gw: 172.31.2.254
 dns: 8.8.8.8
 
 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
@@ -9,8 +9,8 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 vmhost: virthost-rdu01.fedoraproject.org
 volgroup: /dev/vg_guests
 
-eth0_ip: 204.85.14.3
-eth0_nm: 255.255.255.192
+eth0_ip: 172.31.2.22
+eth0_nm: 255.255.255.0
 
 # This is consumed by the roles/fedora-web/main role
 sponsor: redhat
diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org
index aee4dcb363..3120343c39 100644
--- a/inventory/host_vars/virthost-rdu01.fedoraproject.org
+++ b/inventory/host_vars/virthost-rdu01.fedoraproject.org
@@ -2,11 +2,11 @@
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 datacenter: rdu
-nm: 255.255.255.192
-gw: 204.85.14.62
+nm: 255.255.255.0
+gw: 172.31.2.254
 dns: 8.8.8.8
 postfix_group: vpn
-br0_ip: 204.85.14.4
-br0_nm: 255.255.255.192
+br0_ip: 172.31.2.11
+br0_nm: 255.255.255.0
 vpn: true
 
diff --git a/roles/batcave/files/allows b/roles/batcave/files/allows
index 0f46afaf2d..d2efe1f0ea 100644
--- a/roles/batcave/files/allows
+++ b/roles/batcave/files/allows
@@ -75,10 +75,7 @@ require ip 2610:28:3090:3001:dead:beef:cafe:fe00/120
 require ip 209.132.180.6
 
 # rdu - rht
-require ip 204.85.14.1
-require ip 204.85.14.2
-require ip 204.85.14.3
-require ip 204.85.14.4
+require ip 209.132.190.0/27
 
 # sourceware systems
 require ip 209.132.180.128/27
diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf
index 9080f86ddd..eed8d387b6 100644
--- a/roles/httpd/proxy/templates/00-namevirtualhost.conf
+++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf
@@ -65,8 +65,8 @@ NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:80
 NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:443
 
 # proxy13
-NameVirtualHost 204.85.14.3:80
-NameVirtualHost 204.85.14.3:443
+NameVirtualHost 209.132.190.2:80
+NameVirtualHost 209.132.190.2:443
 
 # proxy14
 NameVirtualHost 8.43.85.67:80
diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 620d83180e..54088fea1b 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -444,7 +444,7 @@ $wgSquidServersNoPurge = array(
     "192.168.1.13",
 
     # proxy13
-    "204.85.14.3",
+    "209.132.190.2",
     "192.168.1.158",
 
     # proxy14
diff --git a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 b/roles/mediawiki123/templates/LocalSettings.php.fp.j2
index e368dcbec8..33f9322cd4 100644
--- a/roles/mediawiki123/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki123/templates/LocalSettings.php.fp.j2
@@ -384,7 +384,7 @@ $wgSquidServersNoPurge = array(
     "192.168.1.13",
 
     # proxy13
-    "204.85.14.3",
+    "209.132.190.2",
     "192.168.1.158",
 
     # proxy14