diff --git a/charts/loki/loki.yaml b/charts/loki/loki.yaml
index 62645bb..e29b8e9 100644
--- a/charts/loki/loki.yaml
+++ b/charts/loki/loki.yaml
@@ -47,7 +47,7 @@
   ingester:
     chunk_idle_period: 3m
     chunk_block_size: 262144
-    chunk_retain_period: 1m
+    chunk_retain_period: 15m
     max_transfer_retries: 0
     lifecycler:
       ring:
@@ -66,6 +66,7 @@
       #     consistentreads: true
   limits_config:
     enforce_metric_name: false
+    max_streams_per_user: 1000000
     reject_old_samples: true
     reject_old_samples_max_age: 168h
   schema_config:
@@ -152,13 +153,13 @@
 
 replicas: 1
 
-resources: {}
-# limits:
-#   cpu: 200m
-#   memory: 256Mi
-# requests:
-#   cpu: 100m
-#   memory: 128Mi
+resources:
+  limits:
+    cpu: 2
+    memory: 3Gi
+  requests:
+    cpu: 1
+    memory: 2Gi
 
 securityContext:
   fsGroup: 10001
diff --git a/promtail/promtail.yaml b/promtail/promtail.yaml
index e0b9042..7bd3b3c 100644
--- a/promtail/promtail.yaml
+++ b/promtail/promtail.yaml
@@ -29,18 +29,8 @@
   pipeline_stages:
   - json:
       expressions:
-        level:
         timestamp: '"@timestamp"'
-        exception: '"exception"'
-        thread: thread_name
-        logger: logger_name
-        class:
         message:
-  - json:
-      source: exception
-      expressions:
-        exception_message:
-        exception_class:
   - template:
       source: timestamp
       template: '{{ Replace .Value "," "." 1 }}'
@@ -57,12 +47,6 @@
       source: message
       expression: "Gerrit Code Review (?P<gerrit_version>.*) ready"
   - labels:
-      level:
-      exception_message:
-      exception_class:
-      thread:
-      logger:
-      class:
       gerrit_version:
 - job_name: gerrit_httpd
   static_configs:
@@ -76,23 +60,12 @@
   - json:
       expressions:
         timestamp:
-        thread:
-        user:
-        method:
-        status:
-        protocol:
   - template:
       source: timestamp
       template: '{{ Replace .Value "," "." 1 }}'
   - timestamp:
       source: timestamp
       format: '02/Jan/2006:15:04:05.999 -0700'
-  - labels:
-      thread:
-      user:
-      method:
-      status:
-      protocol:
 - job_name: gerrit_sshd
   static_configs:
   - targets:
@@ -105,20 +78,9 @@
   - json:
       expressions:
         timestamp:
-        session:
-        thread:
-        user:
-        account_id:
-        status:
   - template:
       source: timestamp
       template: '{{ Replace .Value "," "." 1 }}'
   - timestamp:
       source: timestamp
       format: 2006-01-02 15:04:05.999 -0700
-  - labels:
-      session:
-      thread:
-      user:
-      account_id:
-      status: