diff --git a/defaults/main.yml b/defaults/main.yml
index 275b227..113c3c1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,62 +27,61 @@ loki_server_config:
   http_listen_address: "{{ loki_listen_address }}"
   http_listen_port: "{{ loki_listen_port }}"
 
+loki_common_config:
+  instance_addr: 127.0.0.1
+  path_prefix: "{{ loki_storage_dir }}"
+  storage:
+    filesystem:
+      chunks_directory: "{{ loki_storage_dir }}/chunks"
+      rules_directory: "{{ loki_storage_dir }}/rules"
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+loki_query_range_config:
+  results_cache:
+    cache:
+      embedded_cache:
+        enabled: true
+        max_size_mb: 100
+
 loki_distributor_config: []
 loki_querier_config: []
 loki_ingester_client_config: []
-loki_ingester_config:
-  lifecycler:
-    address: 127.0.0.1
-    ring:
-      kvstore:
-        store: inmemory
-      replication_factor: 1
-    final_sleep: 0s
-  chunk_idle_period: 5m
-  chunk_retain_period: 30s
+loki_ingester_config: []
+loki_frontend_worker_config: []
+loki_runtime_config: []
+loki_storage_config: []
 
-loki_storage_config:
-  boltdb:
-    directory: "{{ loki_storage_dir }}/index"
-  filesystem:
-    directory: "{{ loki_storage_dir }}/chunks"
-
-loki_chunk_store_config:
-  max_look_back_period: 0s
+loki_chunk_store_config: []
 
 loki_schema_config:
   configs:
-    - from: 2020-01-01
-      store: boltdb
+    - from: 2020-10-24
+      store: tsdb
       object_store: filesystem
-      schema: v11
+      schema: v13
       index:
         prefix: index_
-        period: 168h
-
-      chunks:
-        prefix: index_
-        period: 168h
-      row_shards: 16
+        period: 24h
 
 loki_limits_config:
   enforce_metric_name: false
   reject_old_samples: true
   reject_old_samples_max_age: 168h
 
-loki_frontend_worker_config: []
-loki_runtime_config: []
 loki_table_manager_config:
   retention_deletes_enabled: false
   retention_period: 0s
 
 loki_compactor_config:
-  working_directory: "{{ loki_storage_dir }}/compactor"
-  shared_store: filesystem
+  working_directory: "{{ loki_storage_dir }}/retention"
+  delete_request_store: filesystem
   compaction_interval: 10m
   retention_enabled: true
   retention_delete_delay: 2h
-  retention_delete_worker_count: 50
+  retention_delete_worker_count: 150
 
 promtail_client_config:
   - url: "http://{{ loki_listen_address }}:{{ loki_listen_port }}/loki/api/v1/push"
diff --git a/templates/loki.yml.j2 b/templates/loki.yml.j2
index c231b8c..2e82e68 100644
--- a/templates/loki.yml.j2
+++ b/templates/loki.yml.j2
@@ -13,6 +13,10 @@ auth_enabled: {{ loki_auth_enabled }}
 server:
   {{ loki_server_config | to_nice_yaml(indent=2) | indent(2, False) }}
 {% endif %}
+{% if loki_common_config != [] %}
+common:
+  {{ loki_common_config | to_nice_yaml(indent=2) | indent(2, False) }}
+{% endif %}
 {% if loki_distributor_config != [] %}
 distributor:
   {{ loki_distributor_config | to_nice_yaml(indent=2) | indent(2, False) }}
@@ -62,3 +66,8 @@ runtime_config:
 compactor:
   {{ loki_compactor_config | to_nice_yaml(indent=2) | indent(2, False) }}
 {% endif %}
+
+{% if loki_query_range_config != [] %}
+query_range:
+  {{ loki_query_range_config | to_nice_yaml(indent=2) | indent(2, False) }}
+{% endif %}
\ No newline at end of file