diff --git a/playbooks/roles/gerrit/files/jgit.config b/playbooks/roles/gerrit/files/jgit.config
new file mode 100644
index 0000000000..bb705c7586
--- /dev/null
+++ b/playbooks/roles/gerrit/files/jgit.config
@@ -0,0 +1,2 @@
+[receive]
+	autogc = false
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 3c9d895b90..4286e343e4 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -63,7 +63,7 @@
 
 - name: Write Gerrit config file
   template:
-    src: gerrit.config
+    src: gerrit.config.j2
     dest: "{{ gerrit_site_dir }}/etc/gerrit.config"
     owner: "{{ gerrit_user_name }}"
     group: "{{ gerrit_user_name }}"
@@ -71,7 +71,7 @@
 
 - name: Write Gerrit secure config file
   template:
-    src: secure.config
+    src: secure.config.j2
     dest: "{{ gerrit_site_dir }}/etc/secure.config"
     owner: "{{ gerrit_user_name }}"
     group: "{{ gerrit_user_name }}"
@@ -83,8 +83,17 @@
     dest: "{{ gerrit_site_dir }}/etc/replication.config"
     owner: "{{ gerrit_user_name }}"
     group: "{{ gerrit_user_name }}"
+    mode: 0644
   when: gerrit_replication is defined
 
+- name: Write Gerrit JGit config
+  copy:
+    src: jgit.config
+    dest: "{{ gerrit_site_dir }}/etc/jgit.config"
+    owner: "{{ gerrit_user_name }}"
+    group: "{{ gerrit_user_name }}"
+    mode: 0644
+
 # Server host key for SSH service on port 29418
 - name: Write Gerrit SSH host private key
   copy:
diff --git a/playbooks/roles/gerrit/templates/gerrit.config b/playbooks/roles/gerrit/templates/gerrit.config.j2
similarity index 99%
rename from playbooks/roles/gerrit/templates/gerrit.config
rename to playbooks/roles/gerrit/templates/gerrit.config.j2
index 308f2320bc..df063cf446 100644
--- a/playbooks/roles/gerrit/templates/gerrit.config
+++ b/playbooks/roles/gerrit/templates/gerrit.config.j2
@@ -74,7 +74,6 @@
 [receive]
 	maxObjectSizeLimit = 100 m
 	enableSignedPush = false
-	autogc = false
 [commentlink "bugheader"]
 	match = "([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)"
 	link = "https://launchpad.net/bugs/$2"
diff --git a/playbooks/roles/gerrit/templates/secure.config b/playbooks/roles/gerrit/templates/secure.config.j2
similarity index 100%
rename from playbooks/roles/gerrit/templates/secure.config
rename to playbooks/roles/gerrit/templates/secure.config.j2