diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml
index ce8ea59143..ba371e8b09 100644
--- a/playbooks/groups/sundries.yml
+++ b/playbooks/groups/sundries.yml
@@ -29,7 +29,7 @@
   - role: easyfix/gather
     when: master_sundries_node|bool
   - role: regindexer/build
-    when: master_sundries_node|bool and env != "staging"
+    when: master_sundries_node|bool
   - role: bz_review_report
     when: master_sundries_node|bool and env != "staging"
   - rsyncd
diff --git a/roles/fedora-web/registry/templates/cron-sync-registry-index b/roles/fedora-web/registry/templates/cron-sync-registry-index
index 1862bc6b44..bad1294e8c 100644
--- a/roles/fedora-web/registry/templates/cron-sync-registry-index
+++ b/roles/fedora-web/registry/templates/cron-sync-registry-index
@@ -1,5 +1,7 @@
-30 * * * *  root /usr/bin/rsync -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
 {% if env != 'staging' %}
+30 * * * *  root /usr/bin/rsync -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
 31 * * * *  root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/index/ /srv/web/registry-index/index/
 32 * * * *  root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/icons/ /srv/web/registry-index/icons/
+{% else %}
+30 * * * *  root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/fedora/ /srv/web/registry-index/index/ && /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/icons/ /srv/web/registry-index/icons/ && /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/deltas/ /srv/web/registry-index/deltas/ && /usr/bin/rsync -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
 {% endif %}
diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg
index b1265f0bfb..c53d6db94e 100644
--- a/roles/rsyncd/files/rsyncd.conf.sundries-stg
+++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg
@@ -192,7 +192,7 @@ hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.25
 
 [registry-index]
 comment = registry-index
-path = /srv/web/registry-index
+path = /var/lib/reg-server/static/
 uid = root
 gid = root
 read only = yes
@@ -200,7 +200,7 @@ hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.25
 
 [regindexer]
 comment = regindexer
-path = /var/lib/regindexer/
+path = /srv/web/registry-index
 uid = root
 gid = root
 read only = yes