diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl
index 037324d..13061bd 100644
--- a/values/loki.yml.tpl
+++ b/values/loki.yml.tpl
@@ -9,6 +9,8 @@ global:
 # Main Loki configuration
 loki:
   auth_enabled: false
+  commonConfig:
+    path_prefix: /loki
   image:
     repository: ${loki_image_repository}
     tag: ${loki_image_tag}
@@ -31,11 +33,40 @@ loki:
       admin: ${s3_bucket_name}
       chunks: ${s3_bucket_name}
       ruler: ${s3_bucket_name}
+<<<<<<< HEAD
     s3:
       s3: s3://${region}
       bucketName: ${s3_bucket_name}
       region: ${region}
       s3ForcePathStyle: false
+=======
+      admin: ${s3_bucket_name}
+    object_store:
+      s3:
+        bucketName: ${s3_bucket_name}
+        endpoint: s3.${region}.amazonaws.com
+        region: ${region}
+    use_thanos_objstore: true
+  pattern_ingester:
+    enabled: false
+  # Provisioner settings
+  provisioner:
+    image:
+      repository: ${provisioner_image_repository}
+      tag: ${provisioner_image_tag}
+  querier:
+    max_concurrent: 2
+  replication_factor: 1
+  schemaConfig:
+    configs:
+      - from: 2024-04-01
+        index:
+          period: 24h
+          prefix: index_
+        object_store: s3
+        schema: v13
+        store: tsdb
+>>>>>>> 895316f (add path_prefix)
   tracing:
     enabled: true