diff --git a/config/loki/config.yml b/config/loki/config.yml
index e020d49..a3d6cd7 100644
--- a/config/loki/config.yml
+++ b/config/loki/config.yml
@@ -15,24 +15,23 @@ ingester:
 schema_config:
   configs:
     - from: 2020-01-01
-      store: boltdb-shipper
+      store: tsdb
       object_store: filesystem
-      schema: v11
+      schema: v13
       index:
         prefix: index_
         period: 24h
 
 storage_config:
-  boltdb_shipper:
-    active_index_directory: /loki/boltdb-shipper-active
-    cache_location: /loki/boltdb-shipper-cache
-    shared_store: filesystem
+  tsdb_shipper:
+    active_index_directory: /loki/tsdb-index
+    cache_location: /loki/tsdb-cache
   filesystem:
     directory: /loki/chunks
 
 compactor:
   working_directory: /loki/compactor
-  shared_store: filesystem
 
 limits_config:
   retention_period: 720h  # 30 days
+  allow_structured_metadata: false
diff --git a/docker-compose.yml b/docker-compose.yml
index cacdbf6..abd8938 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -266,7 +266,7 @@ services:
 
   # Log Aggregation - Loki
   mvp-loki:
-    image: ${REGISTRY_MIRRORS:-git.motovaultpro.com/egullickson/mirrors}/grafana/loki:2.9.0
+    image: ${REGISTRY_MIRRORS:-git.motovaultpro.com/egullickson/mirrors}/grafana/loki:3.6.1
     container_name: mvp-loki
     restart: unless-stopped
     volumes: