diff --git a/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts
index 291fc7b791..849c10d456 100644
--- a/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts
@@ -1,3 +1,2 @@
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-10.5.126.23 infrastructure.fedoraproject.org
diff --git a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts
index 5a61dcb538..7984e42a1c 100644
--- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts
@@ -1,13 +1,6 @@
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 
-# Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't
-# synced to staging in a meaningful way.  See /usr/local/bin/updatecrl.sh
-209.132.181.16  admin.fedoraproject.org
-10.5.126.88     proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.stg.fedoraproject.org
-10.5.126.23     infrastructure.fedoraproject.org
-10.5.126.210    memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04
 10.5.126.85     db02.stg.fedoraproject.org
 10.5.126.113    db05
 10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-kerneltest
-10.5.126.86     fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
diff --git a/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts
index 6709838cf7..849c10d456 100644
--- a/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts
@@ -1,7 +1,2 @@
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-10.5.126.23 infrastructure.fedoraproject.org
-10.5.125.63	koji.fedoraproject.org
-10.5.125.36	kojipkgs.fedoraproject.org
-10.5.129.240	ppc.koji.fedoraproject.org
-10.5.129.180	s390.koji.fedoraproject.org
diff --git a/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts b/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts
index a8950aaca4..849c10d456 100644
--- a/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts
+++ b/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts
@@ -1,5 +1,2 @@
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-10.5.126.23 infrastructure.fedoraproject.org
-10.5.129.240 ppc.koji.fedoraproject.org ppc-koji01.ppc.fedoraproject.org
-10.5.129.241 db-ppc-koji01.ppc.fedoraproject.org db-ppc-koji01