diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 55b353561b..a8069b5b93 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -297,3 +297,32 @@
 
 - name: Start gerrit
   include_tasks: start.yaml
+
+- name: Set up cron job to optmize git repos
+  cron:
+    name: optmize-git-repos
+    state: present
+    user: gerrit2
+    job: 'find /home/gerrit2/review_site/git/ -type d -name "*.git" -print -exec git --git-dir="{}" gc \;'
+    minute: 17
+    hour: 4
+
+- name: Set up cron job to optmize local mirror git repos
+  cron:
+    name: optmize-local-git-repos
+    state: present
+    user: gerrit2
+    job: 'find /opt/lib/git/ -type d -name "*.git" -print -exec git --git-dir="{}" gc \;'
+    minute: 17
+    hour: 4
+
+# Gerrit rotates their own logs, but doesn't clean them out
+# Delete logs older than a month
+- name: Set up cron job to clean old gerrit logs
+  cron:
+    name: clear-gerrit-logs
+    state: present
+    user: gerrit2
+    job: 'find /home/gerrit2/review_site/logs/*.gz -mtime +30 -exec rm -f {} \;'
+    minute: 1
+    hour: 6