diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl
index 82f4a44..b1431ee 100644
--- a/values/loki.yml.tpl
+++ b/values/loki.yml.tpl
@@ -8,16 +8,7 @@ global:
 
 # Main Loki configuration
 loki:
-  analytics:
-    reporting_enabled: true
   auth_enabled: false
-  compactor:
-    retention_enabled: true
-    delete_request_store: s3
-    working_directory: /data/loki/compactor
-  commonConfig:
-    path_prefix: /data/loki
-    replication_factor: 1
   image:
     repository: ${loki_image_repository}
     tag: ${loki_image_tag}
@@ -31,15 +22,14 @@ loki:
     max_streams_per_user: 1000
     query_timeout: 300s
     retention_period: 2160h
-  pattern_ingester:
-    enabled: true
   # Provisioner settings
   provisioner:
     image:
       repository: ${provisioner_image_repository}
       tag: ${provisioner_image_tag}
   querier:
-    max_concurrent: 2
+    max_concurrent: 4
+  replication_factor: 1
   schemaConfig:
     configs:
       - from: "2024-04-01"
@@ -51,19 +41,16 @@ loki:
           period: 24h
   # Storage configuration
   storage:
+    type: s3
     bucketNames:
-      admin: ${s3_bucket_name}/admin
-      chunks: ${s3_bucket_name}/chunks
-      ruler: ${s3_bucket_name}/ruler
+      admin: ${s3_bucket_name}
+      chunks: ${s3_bucket_name}
+      ruler: ${s3_bucket_name}
     s3:
+      s3: s3://${region}
       bucketName: ${s3_bucket_name}
-      endpoint: s3.${region}.amazonaws.com
       region: ${region}
       s3ForcePathStyle: false
-  storage_config:
-    aws:
-      region: ${region}
-      s3: s3://${region}/${s3_bucket_name}/
   tracing:
     enabled: true
 
@@ -75,7 +62,7 @@ backend:
     targetCPUUtilizationPercentage: 80
   persistence:
     storageClass: ${rwo_storage_class}
-  replicas: 2
+  replicas: 3
   resources:
     requests:
       cpu: 1m
@@ -90,17 +77,7 @@ bloomGateway:
 chunksCache:
   enabled: false
 compactor:
-  compaction_interval: 10m
   replicas: 0
-  retention_delete_delay: 2h
-  retention_delete_worker_count: 150
-  retention_enabled: true
-  shared_store: s3
-  working_directory: /data/loki/compactor
-  persistence:
-    enabled: true
-    size: 10Gi
-    storageClass: ${rwo_storage_class}
 distributer:
   replicas: 0
 gateway:
@@ -143,9 +120,7 @@ read:
     enabled: true
     minReplicas: 1
     targetCPUUtilizationPercentage: 80
-  persistence:
-    storageClass: ${rwo_storage_class}
-  replicas: 2
+  replicas: 3
   resources:
     requests:
       cpu: 1m
@@ -178,7 +153,7 @@ test:
 write:
   persistence:
     storageClass: ${rwo_storage_class}
-  replicas: 2
+  replicas: 3
   autoscaling:
     enabled: true
     minReplicas: 1
@@ -190,9 +165,3 @@ write:
     limits:
       cpu: 1000m
       memory: 512Mi
-  extraVolumesMounts:
-    - name: data
-      mountPath: /data
-  extraVolumes:
-    - name: loki
-      emptyDir: {}