diff --git a/roles/fedora-web/registry/files/cron-sync-registry-index b/roles/fedora-web/registry/files/cron-sync-registry-index
index 7b629f6188..d668490958 100644
--- a/roles/fedora-web/registry/files/cron-sync-registry-index
+++ b/roles/fedora-web/registry/files/cron-sync-registry-index
@@ -1 +1,2 @@
 30 * * * *  root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
+40 * * * *  root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/ /srv/web/registry-index/index/
diff --git a/roles/regindexer/build/tasks/main.yml b/roles/regindexer/build/tasks/main.yml
new file mode 100644
index 0000000000..d820abaf23
--- /dev/null
+++ b/roles/regindexer/build/tasks/main.yml
@@ -0,0 +1,16 @@
+---
+- name: install needed packages
+  package: name=regindexer state=installed
+  tags:
+  - packages
+  - regindexer
+
+- name: Install config.yaml file
+  template: source=config.yaml dest=/etc/regindexer/config.yaml 
+  tags:
+  - regindexer
+
+- name: enable service
+  service: name=regindexer state=started enabled=true
+  tags:
+  - regindexer
diff --git a/roles/regindexer/build/templates/config.yaml b/roles/regindexer/build/templates/config.yaml
new file mode 100644
index 0000000000..b3618e7835
--- /dev/null
+++ b/roles/regindexer/build/templates/config.yaml
@@ -0,0 +1,36 @@
+icons_dir: /var/lib/regindexer/icons/
+icons_uri: /app-icons/
+indexes:
+    flatpak:
+        output: /var/lib/regindexer/index/flatpak.json
+        registry: http://registry{{ env_suffix }}.fedoraproject.org:5000
+        registry_public: /
+        tags: ['latest']
+        required_annotations: ['org.flatpak.ref']
+        extract_icons: True
+    flatpak_testing:
+        output: /var/lib/regindexer/index/flatpak-testing.json
+        registry: https://registry{{ env_suffix }}.fedoraproject.org    
+        registry_public: /
+        tags: ['testing']
+        required_annotations: ['org.flatpak.ref']
+        extract_icons: True
+    flatpak_amd64:
+        output: /var/lib/regindexer/index/flatpak-amd64.json
+        registry: https://registry{{ env_suffix }}.fedoraproject.org    
+        registry_public: /
+        tags: [‘latest’]
+        required_annotations: ['org.flatpak.ref']
+        architectures: ['amd64']
+        extract_icons: True
+    flatpak_testing_amd64:
+        output: /var/lib/regindexer/index/flatpak-testing-amd64.json
+        registry: https://registry{{ env_suffix }}.fedoraproject.org    
+        registry_public: /
+        tags: [‘testing’]
+        required_annotations: ['org.flatpak.ref']
+        architectures: ['amd64']
+        extract_icons: True
+daemon: 
+    topic_prefix: org.fedoraproject
+    environment: {stg/prod}
diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg
index 2686e9a010..17ab21b326 100644
--- a/roles/rsyncd/files/rsyncd.conf.sundries-stg
+++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg
@@ -214,6 +214,14 @@ gid = root
 read only = yes
 hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0
 
+[regindexer]
+comment = regindexer
+path = /var/lib/regindexer/
+uid = root
+gid = root
+read only = yes
+hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0
+
 [docs-redirects]
 comment = Docs Site Redirects
 path = /srv/web/docs-redirects