diff --git a/salt/bugs/init.sls b/salt/bugs/init.sls
index aaa55393..04c070ab 100644
--- a/salt/bugs/init.sls
+++ b/salt/bugs/init.sls
@@ -233,9 +233,19 @@ tracker-{{ tracker }}-clone:
 tracker-{{ tracker }}-clone-permissions:
   file.directory:
     - name: /srv/roundup/trackers/{{ tracker }}
-    - user: roundup
-    - group: roundup
-    - mode: "0770"
+    - mode: "0750"
+
+tracker-{{ tracker }}-gitconfig:
+  file.blockreplace:
+    - name: /etc/gitconfig
+    - marker_start: "# TRACKER-{{ tracker }}-START"
+    - marker_end: "# TRACKER-{{ tracker }}-END"
+    - content: |
+        [safe]
+        directory = /srv/roundup/trackers/{{ tracker }}
+    - append_if_not_found: True
+    - require:
+        - file: tracker-{{ tracker }}-clone-permissions
 
 tracker-{{ tracker }}-config:
   file.managed: