diff --git a/inventory/host_vars/download04.phx2.fedoraproject.org b/inventory/host_vars/download04.phx2.fedoraproject.org
index d69d2887a8..98874984a3 100644
--- a/inventory/host_vars/download04.phx2.fedoraproject.org
+++ b/inventory/host_vars/download04.phx2.fedoraproject.org
@@ -2,4 +2,5 @@
 gw: 10.5.126.254
 eth0_ip: 10.5.126.96
 eth1_ip: 10.5.127.104
-host_group: download-phx2-tier1
+# This is a tier1 only host
+rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}-tier1"
diff --git a/inventory/host_vars/download05.phx2.fedoraproject.org b/inventory/host_vars/download05.phx2.fedoraproject.org
index a365460adc..e018bc6c1d 100644
--- a/inventory/host_vars/download05.phx2.fedoraproject.org
+++ b/inventory/host_vars/download05.phx2.fedoraproject.org
@@ -2,4 +2,5 @@
 gw: 10.5.126.254
 eth0_ip: 10.5.126.97
 eth1_ip: 10.5.127.105
-host_group: download-phx2-tier1
+# This is a tier1 only host
+rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}-tier1"
diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml
index d8135420fe..79ae10e6c9 100644
--- a/roles/rsyncd/tasks/main.yml
+++ b/roles/rsyncd/tasks/main.yml
@@ -28,10 +28,10 @@
 - name: rsyncd.conf file
   copy: src={{ item }} dest=/etc/rsyncd.conf mode=0644
   with_first_found:
-    - rsyncd.conf.{{ rsync_group }}
     - "{{ rsyncd_conf }}"
     - rsyncd.conf.{{ inventory_hostname }}
     - rsyncd.conf.{{ host_group }}
+    - rsyncd.conf.{{ rsync_group }}
     - rsyncd.conf.default
   notify:
   - restart xinetd