diff --git a/logging/conf/loki-config.yml b/logging/conf/loki-config.yml
index d811077a..55b27d7e 100644
--- a/logging/conf/loki-config.yml
+++ b/logging/conf/loki-config.yml
@@ -42,16 +42,21 @@ storage_config:
 compactor:
   working_directory: /loki/boltdb-shipper-compactor
   shared_store: filesystem
+  retention_enabled: true
+  retention_delete_delay: 2h
+  retention_delete_worker_count: 150
+  delete_request_cancel_period: 5m
 
 limits_config:
   reject_old_samples: true
   reject_old_samples_max_age: 168h
+  retention_period: 720h  # Retain logs for 30 days
 
 chunk_store_config:
   max_look_back_period: 0s
 
 table_manager:
-  retention_deletes_enabled: false
+  retention_deletes_enabled: false  # Not used with boltdb-shipper
   retention_period: 0s
 
 ruler:
diff --git a/logging/grafana-loki/docker-compose.yml b/logging/grafana-loki/docker-compose.yml
index 2e2f840d..61eedd42 100644
--- a/logging/grafana-loki/docker-compose.yml
+++ b/logging/grafana-loki/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 
 services:
   loki:
-    image: grafana/loki:2.9.0
+    image: grafana/loki:2.9.14
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/loki-config.yaml
@@ -27,7 +27,7 @@ services:
       - traefik-proxy
 
   promtail:
-    image: grafana/promtail:2.9.0
+    image: grafana/promtail:2.9.14
     command: -config.file=/etc/promtail/config.yml
     ports:
       - 127.0.0.1:3200:3100
@@ -35,7 +35,7 @@ services:
       - loki
 
   mimir:
-    image: grafana/mimir:2.9.0
+    image: grafana/mimir:2.9.14
     volumes:
       - /root/mimir/conf/etc/mimir.yml:/etc/mimir-config/mimir.yml:ro
     entrypoint: