diff --git a/cluster/manifests/freeleaps-logging-system/loki/values.yaml b/cluster/manifests/freeleaps-logging-system/loki/values.yaml
index 40a64839..967ad87d 100644
--- a/cluster/manifests/freeleaps-logging-system/loki/values.yaml
+++ b/cluster/manifests/freeleaps-logging-system/loki/values.yaml
@@ -3760,9 +3760,9 @@ monitoring:
 # -- DEPRECATED Configuration for the table-manager. The table-manager is only necessary when using a deprecated
 # index type such as Cassandra, Bigtable, or DynamoDB, it has not been necessary since loki introduced self-
 # contained index types like 'boltdb-shipper' and 'tsdb'. This will be removed in a future helm chart.
-tableManager:
-  # -- Specifies whether the table-manager should be enabled
-  enabled: false
+  tableManager:
+    # -- Specifies whether the table-manager should be enabled
+    enabled: true
   image:
     # -- The Docker registry for the table-manager image. Overrides `loki.image.registry`
     registry: null
@@ -3816,7 +3816,7 @@ tableManager:
   nodeSelector: {}
   # -- Tolerations for table-manager pods
   tolerations: []
-  # -- Enable deletes by retention
-  retention_deletes_enabled: false
-  # -- Set retention period
-  retention_period: 0
+      # -- Enable deletes by retention
+    retention_deletes_enabled: true
+    # -- Set retention period
+    retention_period: 30d
diff --git a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml
index c95f4da1..40e2aff0 100644
--- a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml
+++ b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml
@@ -1165,7 +1165,15 @@ grafana:
 
   ## Configure additional grafana datasources (passed through tpl)
   ## ref: http://docs.grafana.org/administration/provisioning/#datasources
-  additionalDataSources: []
+  additionalDataSources:
+    - name: Loki
+      type: loki
+      url: http://loki-gateway.freeleaps-logging-system
+      access: proxy
+      editable: false
+      jsonData:
+        maxLines: 1000
+        timeout: 30
   # - name: prometheus-sample
   #   access: proxy
   #   basicAuth: true
diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml
index f321d67b..1c4a74a8 100644
--- a/freeleaps/helm-pkg/chat/values.prod.yaml
+++ b/freeleaps/helm-pkg/chat/values.prod.yaml
@@ -8,6 +8,11 @@ dashboard:
   name: freeleaps-prod-chat-dashboard
   title: Chat Service Dashboard (PROD)
   metricsPrefix: freeleaps_chat
+logIngest:
+  enabled: true
+  lokiEndpoint: http://loki-gateway.freeleaps-logging-system
+  logPathPattern: /app/log/chat/*.log
+  logPath: /app/log/chat
 chat:
   replicas: 1
   image:
diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml
index 52ae1f74..f6876529 100644
--- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml
@@ -8,6 +8,11 @@ dashboard:
   name: freeleaps-prod-backend-dashboard
   title: Backend Service Dashboard (PROD)
   metricsPrefix: freeleaps_backend
+logIngest:
+  enabled: true
+  lokiEndpoint: http://loki-gateway.freeleaps-logging-system
+  logPathPattern: /app/log/freeleaps/*.log
+  logPath: /app/log/freeleaps
 freeleaps:
   replicas: 1
   image: