diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
index da82079e88..e8ff90ea13 100644
--- a/charts/loki-distributed/Chart.yaml
+++ b/charts/loki-distributed/Chart.yaml
@@ -4,7 +4,7 @@ name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
 appVersion: 2.9.13
-version: 0.80.6
+version: 0.80.7
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki
diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
index 099ca81285..3ce1b8445b 100644
--- a/charts/loki-distributed/README.md
+++ b/charts/loki-distributed/README.md
@@ -7,7 +7,7 @@ chart instead, which provides comprehensive features and ongoing maintenance.
 
 # loki-distributed
 
-![Version: 0.80.6](https://img.shields.io/badge/Version-0.80.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.13](https://img.shields.io/badge/AppVersion-2.9.13-informational?style=flat-square)
+![Version: 0.80.7](https://img.shields.io/badge/Version-0.80.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.13](https://img.shields.io/badge/AppVersion-2.9.13-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 
diff --git a/charts/loki-distributed/templates/distributor/hpa.yaml b/charts/loki-distributed/templates/distributor/hpa.yaml
index 7a907392a2..c9791c0edf 100644
--- a/charts/loki-distributed/templates/distributor/hpa.yaml
+++ b/charts/loki-distributed/templates/distributor/hpa.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "loki.distributorFullname" . }}
   labels:
     {{- include "loki.distributorLabels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/charts/loki-distributed/templates/gateway/configmap-gateway.yaml b/charts/loki-distributed/templates/gateway/configmap-gateway.yaml
index 9d99b3ed00..c55f2363d0 100644
--- a/charts/loki-distributed/templates/gateway/configmap-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/configmap-gateway.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "loki.gatewayFullname" . }}
   labels:
     {{- include "loki.gatewayLabels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 data:
   nginx.conf: |
     {{- tpl .Values.gateway.nginxConfig.file . | nindent 4 }}
diff --git a/charts/loki-distributed/templates/gateway/deployment-gateway.yaml b/charts/loki-distributed/templates/gateway/deployment-gateway.yaml
index c3c2d61e97..3b76ec302b 100644
--- a/charts/loki-distributed/templates/gateway/deployment-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/deployment-gateway.yaml
@@ -9,6 +9,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
 {{- if not .Values.gateway.autoscaling.enabled }}
   replicas: {{ .Values.gateway.replicas }}
diff --git a/charts/loki-distributed/templates/gateway/hpa.yaml b/charts/loki-distributed/templates/gateway/hpa.yaml
index 937d44766a..d984e73c20 100644
--- a/charts/loki-distributed/templates/gateway/hpa.yaml
+++ b/charts/loki-distributed/templates/gateway/hpa.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "loki.gatewayFullname" . }}
   labels:
     {{- include "loki.gatewayLabels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/charts/loki-distributed/templates/gateway/ingress-gateway.yaml b/charts/loki-distributed/templates/gateway/ingress-gateway.yaml
index 5214b9a396..dbf7065e3c 100644
--- a/charts/loki-distributed/templates/gateway/ingress-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/ingress-gateway.yaml
@@ -16,6 +16,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   {{- if and $ingressSupportsIngressClassName .Values.gateway.ingress.ingressClassName }}
   ingressClassName: {{ .Values.gateway.ingress.ingressClassName }}
diff --git a/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml b/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml
index 0929d13bb0..b39365220d 100644
--- a/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml
@@ -8,6 +8,7 @@ metadata:
   name: {{ include "loki.gatewayFullname" . }}
   labels:
     {{- include "loki.gatewayLabels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
diff --git a/charts/loki-distributed/templates/gateway/secret-gateway.yaml b/charts/loki-distributed/templates/gateway/secret-gateway.yaml
index f7cc8a6765..5346bead53 100644
--- a/charts/loki-distributed/templates/gateway/secret-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/secret-gateway.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "loki.gatewayFullname" $ }}
   labels:
     {{- include "loki.gatewayLabels" $ | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 stringData:
   .htpasswd: |
     {{- tpl .basicAuth.htpasswd $ | nindent 4 }}
diff --git a/charts/loki-distributed/templates/gateway/service-gateway.yaml b/charts/loki-distributed/templates/gateway/service-gateway.yaml
index 0c9afc1812..1dd2d87f98 100644
--- a/charts/loki-distributed/templates/gateway/service-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/service-gateway.yaml
@@ -12,6 +12,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: {{ .Values.gateway.service.type }}
   {{- with .Values.gateway.service.clusterIP }}
diff --git a/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml b/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml
index 4c79e0d4f8..f76ddbef73 100644
--- a/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml
+++ b/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml
@@ -8,6 +8,7 @@ metadata:
   name: {{ include "loki.indexGatewayFullname" . }}
   labels:
     {{- include "loki.indexGatewayLabels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
diff --git a/charts/loki-distributed/templates/index-gateway/service-index-gateway-headless.yaml b/charts/loki-distributed/templates/index-gateway/service-index-gateway-headless.yaml
index 5763437c54..ae995a68e8 100644
--- a/charts/loki-distributed/templates/index-gateway/service-index-gateway-headless.yaml
+++ b/charts/loki-distributed/templates/index-gateway/service-index-gateway-headless.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     {{- include "loki.indexGatewaySelectorLabels" . | nindent 4 }}
     prometheus.io/service-monitor: "false"
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None
diff --git a/charts/loki-distributed/templates/index-gateway/service-index-gateway.yaml b/charts/loki-distributed/templates/index-gateway/service-index-gateway.yaml
index 81984ac80d..a5bf8c9110 100644
--- a/charts/loki-distributed/templates/index-gateway/service-index-gateway.yaml
+++ b/charts/loki-distributed/templates/index-gateway/service-index-gateway.yaml
@@ -12,6 +12,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   ports:
diff --git a/charts/loki-distributed/templates/index-gateway/statefulset-index-gateway.yaml b/charts/loki-distributed/templates/index-gateway/statefulset-index-gateway.yaml
index b91a2910ef..ebbccc1dfa 100644
--- a/charts/loki-distributed/templates/index-gateway/statefulset-index-gateway.yaml
+++ b/charts/loki-distributed/templates/index-gateway/statefulset-index-gateway.yaml
@@ -9,6 +9,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.indexGateway.replicas }}
   updateStrategy:
diff --git a/charts/loki-distributed/templates/networkpolicy.yaml b/charts/loki-distributed/templates/networkpolicy.yaml
index b8c0d98a3c..ec44ac4fba 100644
--- a/charts/loki-distributed/templates/networkpolicy.yaml
+++ b/charts/loki-distributed/templates/networkpolicy.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "loki.name" . }}-namespace-only
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Ingress
@@ -25,6 +26,7 @@ metadata:
   name: {{ include "loki.name" . }}-egress-dns
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Egress
@@ -45,6 +47,7 @@ metadata:
   name: {{ include "loki.name" . }}-ingress
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Ingress
@@ -83,6 +86,7 @@ metadata:
   name: {{ include "loki.name" . }}-ingress-metrics
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Ingress
@@ -117,6 +121,7 @@ metadata:
   name: {{ include "loki.name" . }}-egress-alertmanager
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Egress
@@ -146,6 +151,7 @@ metadata:
   name: {{ include "loki.name" . }}-egress-external-storage
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Egress
@@ -177,6 +183,7 @@ metadata:
   name: {{ include "loki.name" . }}-egress-discovery
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   policyTypes:
     - Egress
diff --git a/charts/loki-distributed/templates/podsecuritypolicy.yaml b/charts/loki-distributed/templates/podsecuritypolicy.yaml
index d0b1212abb..06ef7a61aa 100644
--- a/charts/loki-distributed/templates/podsecuritypolicy.yaml
+++ b/charts/loki-distributed/templates/podsecuritypolicy.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "loki.fullname" . }}
   labels:
     {{- include "loki.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   privileged: false
   allowPrivilegeEscalation: false
diff --git a/charts/loki-distributed/templates/ruler/configmap-ruler.yaml b/charts/loki-distributed/templates/ruler/configmap-ruler.yaml
index c0599d5431..85a163eaa9 100644
--- a/charts/loki-distributed/templates/ruler/configmap-ruler.yaml
+++ b/charts/loki-distributed/templates/ruler/configmap-ruler.yaml
@@ -7,6 +7,7 @@ metadata:
   name: {{ include "loki.rulerFullname" $ }}-{{ include "loki.rulerRulesDirName" $dir }}
   labels:
     {{- include "loki.rulerLabels" $ | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 data:
   {{- toYaml $files | nindent 2}}
 {{- end }}
diff --git a/charts/loki-distributed/templates/ruler/deployment-ruler.yaml b/charts/loki-distributed/templates/ruler/deployment-ruler.yaml
index 955c5e6ff8..bf0ed2fd5c 100644
--- a/charts/loki-distributed/templates/ruler/deployment-ruler.yaml
+++ b/charts/loki-distributed/templates/ruler/deployment-ruler.yaml
@@ -10,6 +10,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.ruler.replicas }}
   strategy:
diff --git a/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml b/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml
index 2fde96d5c0..06b66e5d58 100644
--- a/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml
+++ b/charts/loki-distributed/templates/ruler/persistentvolumeclaim-ruler.yaml
@@ -9,6 +9,7 @@ metadata:
   annotations:
     {{- . | toYaml | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml b/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml
index e418d0b3ac..932c799a9b 100644
--- a/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml
+++ b/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml
@@ -8,6 +8,7 @@ metadata:
   name: {{ include "loki.rulerFullname" . }}
   labels:
     {{- include "loki.rulerLabels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
diff --git a/charts/loki-distributed/templates/ruler/service-ruler.yaml b/charts/loki-distributed/templates/ruler/service-ruler.yaml
index 710ab8206c..d9eb89877c 100644
--- a/charts/loki-distributed/templates/ruler/service-ruler.yaml
+++ b/charts/loki-distributed/templates/ruler/service-ruler.yaml
@@ -12,6 +12,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None
diff --git a/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml b/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml
index 2172851700..b95543d7dc 100644
--- a/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml
+++ b/charts/loki-distributed/templates/ruler/statefulset-ruler.yaml
@@ -10,6 +10,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.ruler.replicas }}
   revisionHistoryLimit: {{ .Values.loki.revisionHistoryLimit }}
diff --git a/charts/loki-distributed/templates/table-manager/deployment-table-manager.yaml b/charts/loki-distributed/templates/table-manager/deployment-table-manager.yaml
index f550ae838c..72ffcb3c31 100644
--- a/charts/loki-distributed/templates/table-manager/deployment-table-manager.yaml
+++ b/charts/loki-distributed/templates/table-manager/deployment-table-manager.yaml
@@ -9,6 +9,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.loki.revisionHistoryLimit }}
diff --git a/charts/loki-distributed/templates/table-manager/service-table-manager.yaml b/charts/loki-distributed/templates/table-manager/service-table-manager.yaml
index 91a41afa37..338dac228a 100644
--- a/charts/loki-distributed/templates/table-manager/service-table-manager.yaml
+++ b/charts/loki-distributed/templates/table-manager/service-table-manager.yaml
@@ -13,6 +13,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   ports: