diff --git a/roles/regindexer/build/tasks/main.yml b/roles/regindexer/build/tasks/main.yml
index 7cc46b548d..c60c87e6a0 100644
--- a/roles/regindexer/build/tasks/main.yml
+++ b/roles/regindexer/build/tasks/main.yml
@@ -5,6 +5,11 @@
   - packages
   - regindexer
 
+- name: make sure regindexer owns it's own files
+  file: path=/var/lib/regindexer recurse=yes owner=regindexer group=regindexer
+  tags:
+  - regindexer
+
 - name: Install config.yaml file
   template: src=config.yaml dest=/etc/regindexer/config.yaml 
   tags:
diff --git a/roles/regindexer/build/templates/config.yaml b/roles/regindexer/build/templates/config.yaml
index 26e53656de..3fc3a30b19 100644
--- a/roles/regindexer/build/templates/config.yaml
+++ b/roles/regindexer/build/templates/config.yaml
@@ -33,4 +33,4 @@ indexes:
         extract_icons: True
 daemon: 
     topic_prefix: org.fedoraproject
-    environment: {stg/prod}
+    environment: "{{ env }}"