diff --git a/gerrit/etc/jgit.config.template b/gerrit/etc/jgit.config.template
index 630cd94..d65673a 100644
--- a/gerrit/etc/jgit.config.template
+++ b/gerrit/etc/jgit.config.template
@@ -1,2 +1,5 @@
 [core]
-  trustFolderStat = {{ TRUST_FOLDER_STAT }}
\ No newline at end of file
+  trustFolderStat = {{ TRUST_FOLDER_STAT }}
+
+[receive]
+  autogc = false
\ No newline at end of file
diff --git a/master-slave/cf-service-master.yml b/master-slave/cf-service-master.yml
index f1e7e95..e4060f2 100644
--- a/master-slave/cf-service-master.yml
+++ b/master-slave/cf-service-master.yml
@@ -267,6 +267,8 @@
                       Value: !Ref SlaveSubdomain
                     - Name: HOSTED_ZONE_NAME
                       Value: !Ref HostedZoneName
+                    - Name: REINDEX_AT_STARTUP
+                      Value: false
                     - Name: METRICS_CLOUDWATCH_ENABLED
                       Value: !Ref MetricsCloudwatchEnabled
                     - Name: METRICS_CLOUDWATCH_NAMESPACE
diff --git a/single-master/cf-service.yml b/single-master/cf-service.yml
index fcfe842..7302e6a 100644
--- a/single-master/cf-service.yml
+++ b/single-master/cf-service.yml
@@ -213,6 +213,8 @@
                       Value: !Ref AWS::Region
                     - Name: GERRIT_KEY_PREFIX
                       Value: !Ref GerritKeyPrefix
+                    - Name: REINDEX_AT_STARTUP
+                      Value: false
                     - Name: GERRIT_HEAP_LIMIT
                       Value: !Ref GerritHeapLimit
                     - Name: JGIT_CACHE_SIZE