diff --git a/inventory/inventory b/inventory/inventory
index 0bf49136eb..66c95ad7a9 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -496,8 +496,20 @@ mirrorlist-phx2.phx2.fedoraproject.org
 mirrorlist-phx2.stg.phx2.fedoraproject.org
 
 [mirrorlist-proxies]
+proxy01.phx2.fedoraproject.org
 proxy02.fedoraproject.org
+proxy03.fedoraproject.org
+proxy04.fedoraproject.org
 proxy05.fedoraproject.org
+proxy06.fedoraproject.org
+proxy07.fedoraproject.org
+proxy08.fedoraproject.org
+proxy09.fedoraproject.org
+proxy10.phx2.fedoraproject.org
+proxy11.fedoraproject.org
+proxy12.fedoraproject.org
+proxy13.fedoraproject.org
+proxy14.fedoraproject.org
 
 [mm-frontend]
 mm-frontend01.phx2.fedoraproject.org
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index d01a567a27..4ebe1e76f3 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -20,7 +20,7 @@
   - sudo
   - rsyncd
   - { role: mirrormanager/mirrorlist_proxy,
-      when: env == "staging" or ansible_hostname == "proxy02" or ansible_hostname == "proxy05" }
+      when: env == "staging" or "'mirrorlist-proxy' in group_names" }
   - { role: openvpn/client,
       when: env != "staging" }
   - apache