From 7eac27f8be0aa015d343c0fdb2ecf75ed803a10f Mon Sep 17 00:00:00 2001
From: yoninl2 <yong.jiang1@hp.com>
Date: Thu, 7 May 2020 08:08:51 +0000
Subject: [PATCH] [stable/prometheus-operator] namespace override

---
 stable/concourse/templates/web-rolebinding.yaml       |  2 +-
 stable/couchdb/templates/_helpers.tpl                 |  2 +-
 stable/datadog/templates/system-probe-configmap.yaml  |  4 ++--
 stable/minio/templates/statefulset.yaml               |  2 +-
 .../mongodb/templates/prometheus-service-monitor.yaml |  2 +-
 stable/openebs/templates/psp-clusterrolebinding.yaml  |  2 +-
 stable/openebs/templates/psp.yaml                     |  2 +-
 .../templates/servicemonitor.yaml                     |  2 +-
 stable/prometheus-operator/Chart.yaml                 |  2 +-
 stable/prometheus-operator/README.md                  |  4 ++++
 .../hack/sync_grafana_dashboards.py                   |  2 +-
 stable/prometheus-operator/templates/NOTES.txt        |  2 +-
 stable/prometheus-operator/templates/_helpers.tpl     | 11 +++++++++++
 .../templates/alertmanager/alertmanager.yaml          |  4 ++--
 .../templates/alertmanager/ingress.yaml               |  2 +-
 .../templates/alertmanager/ingressperreplica.yaml     |  4 ++--
 .../templates/alertmanager/podDisruptionBudget.yaml   |  2 +-
 .../templates/alertmanager/psp-role.yaml              |  2 +-
 .../templates/alertmanager/psp-rolebinding.yaml       |  4 ++--
 .../templates/alertmanager/psp.yaml                   |  2 +-
 .../templates/alertmanager/secret.yaml                |  2 +-
 .../templates/alertmanager/service.yaml               |  2 +-
 .../templates/alertmanager/serviceaccount.yaml        |  2 +-
 .../templates/alertmanager/servicemonitor.yaml        |  4 ++--
 .../templates/alertmanager/serviceperreplica.yaml     |  4 ++--
 .../templates/exporters/core-dns/servicemonitor.yaml  |  2 +-
 .../exporters/kube-api-server/servicemonitor.yaml     |  2 +-
 .../kube-controller-manager/servicemonitor.yaml       |  2 +-
 .../templates/exporters/kube-dns/servicemonitor.yaml  |  2 +-
 .../templates/exporters/kube-etcd/servicemonitor.yaml |  2 +-
 .../exporters/kube-proxy/servicemonitor.yaml          |  2 +-
 .../exporters/kube-scheduler/servicemonitor.yaml      |  2 +-
 .../exporters/kube-state-metrics/serviceMonitor.yaml  |  2 +-
 .../templates/exporters/kubelet/servicemonitor.yaml   |  2 +-
 .../exporters/node-exporter/servicemonitor.yaml       |  2 +-
 .../templates/grafana/configmap-dashboards.yaml       |  2 +-
 .../templates/grafana/configmaps-datasources.yaml     |  2 +-
 .../templates/grafana/dashboards-1.14/apiserver.yaml  |  2 +-
 .../grafana/dashboards-1.14/cluster-total.yaml        |  2 +-
 .../grafana/dashboards-1.14/controller-manager.yaml   |  2 +-
 .../templates/grafana/dashboards-1.14/etcd.yaml       |  2 +-
 .../grafana/dashboards-1.14/k8s-coredns.yaml          |  2 +-
 .../dashboards-1.14/k8s-resources-cluster.yaml        |  2 +-
 .../dashboards-1.14/k8s-resources-namespace.yaml      |  2 +-
 .../grafana/dashboards-1.14/k8s-resources-node.yaml   |  2 +-
 .../grafana/dashboards-1.14/k8s-resources-pod.yaml    |  2 +-
 .../dashboards-1.14/k8s-resources-workload.yaml       |  2 +-
 .../k8s-resources-workloads-namespace.yaml            |  2 +-
 .../templates/grafana/dashboards-1.14/kubelet.yaml    |  2 +-
 .../grafana/dashboards-1.14/namespace-by-pod.yaml     |  2 +-
 .../dashboards-1.14/namespace-by-workload.yaml        |  2 +-
 .../dashboards-1.14/node-cluster-rsrc-use.yaml        |  2 +-
 .../grafana/dashboards-1.14/node-rsrc-use.yaml        |  2 +-
 .../templates/grafana/dashboards-1.14/nodes.yaml      |  2 +-
 .../dashboards-1.14/persistentvolumesusage.yaml       |  2 +-
 .../templates/grafana/dashboards-1.14/pod-total.yaml  |  2 +-
 .../dashboards-1.14/prometheus-remote-write.yaml      |  2 +-
 .../templates/grafana/dashboards-1.14/prometheus.yaml |  2 +-
 .../templates/grafana/dashboards-1.14/proxy.yaml      |  2 +-
 .../templates/grafana/dashboards-1.14/scheduler.yaml  |  2 +-
 .../grafana/dashboards-1.14/statefulset.yaml          |  2 +-
 .../grafana/dashboards-1.14/workload-total.yaml       |  2 +-
 .../templates/grafana/dashboards/etcd.yaml            |  2 +-
 .../grafana/dashboards/k8s-cluster-rsrc-use.yaml      |  2 +-
 .../grafana/dashboards/k8s-node-rsrc-use.yaml         |  2 +-
 .../grafana/dashboards/k8s-resources-cluster.yaml     |  2 +-
 .../grafana/dashboards/k8s-resources-namespace.yaml   |  2 +-
 .../grafana/dashboards/k8s-resources-pod.yaml         |  2 +-
 .../grafana/dashboards/k8s-resources-workload.yaml    |  2 +-
 .../dashboards/k8s-resources-workloads-namespace.yaml |  2 +-
 .../templates/grafana/dashboards/nodes.yaml           |  2 +-
 .../grafana/dashboards/persistentvolumesusage.yaml    |  2 +-
 .../templates/grafana/dashboards/pods.yaml            |  2 +-
 .../templates/grafana/dashboards/statefulset.yaml     |  2 +-
 .../templates/grafana/servicemonitor.yaml             |  4 ++--
 .../job-patch/clusterrolebinding.yaml                 |  4 ++--
 .../job-patch/job-createSecret.yaml                   |  6 +++---
 .../job-patch/job-patchWebhook.yaml                   |  4 ++--
 .../admission-webhooks/job-patch/psp.yaml             |  2 +-
 .../admission-webhooks/job-patch/role.yaml            |  2 +-
 .../admission-webhooks/job-patch/rolebinding.yaml     |  4 ++--
 .../admission-webhooks/job-patch/serviceaccount.yaml  |  2 +-
 .../mutatingWebhookConfiguration.yaml                 |  2 +-
 .../validatingWebhookConfiguration.yaml               |  2 +-
 .../templates/prometheus-operator/cleanup-crds.yaml   |  2 +-
 .../prometheus-operator/clusterrolebinding.yaml       |  2 +-
 .../templates/prometheus-operator/deployment.yaml     |  4 ++--
 .../prometheus-operator/psp-clusterrolebinding.yaml   |  2 +-
 .../templates/prometheus-operator/psp.yaml            |  2 +-
 .../templates/prometheus-operator/service.yaml        |  2 +-
 .../templates/prometheus-operator/serviceaccount.yaml |  2 +-
 .../templates/prometheus-operator/servicemonitor.yaml |  4 ++--
 .../prometheus/additionalAlertRelabelConfigs.yaml     |  2 +-
 .../prometheus/additionalAlertmanagerConfigs.yaml     |  2 +-
 .../prometheus/additionalPrometheusRules.yaml         |  4 ++--
 .../templates/prometheus/additionalScrapeConfigs.yaml |  2 +-
 .../templates/prometheus/clusterrolebinding.yaml      |  2 +-
 .../templates/prometheus/ingress.yaml                 |  2 +-
 .../templates/prometheus/ingressperreplica.yaml       |  4 ++--
 .../templates/prometheus/podDisruptionBudget.yaml     |  2 +-
 .../templates/prometheus/podmonitors.yaml             |  2 +-
 .../templates/prometheus/prometheus.yaml              |  6 +++---
 .../templates/prometheus/psp-clusterrolebinding.yaml  |  2 +-
 .../prometheus-operator/templates/prometheus/psp.yaml |  2 +-
 .../prometheus/rules-1.14/alertmanager.rules.yaml     |  4 ++--
 .../templates/prometheus/rules-1.14/etcd.yaml         |  2 +-
 .../prometheus/rules-1.14/general.rules.yaml          |  2 +-
 .../templates/prometheus/rules-1.14/k8s.rules.yaml    |  2 +-
 .../prometheus/rules-1.14/kube-apiserver-slos.yaml    |  2 +-
 .../prometheus/rules-1.14/kube-apiserver.rules.yaml   |  2 +-
 .../rules-1.14/kube-prometheus-general.rules.yaml     |  2 +-
 .../kube-prometheus-node-recording.rules.yaml         |  2 +-
 .../prometheus/rules-1.14/kube-scheduler.rules.yaml   |  2 +-
 .../prometheus/rules-1.14/kube-state-metrics.yaml     |  2 +-
 .../prometheus/rules-1.14/kubelet.rules.yaml          |  2 +-
 .../prometheus/rules-1.14/kubernetes-apps.yaml        |  2 +-
 .../prometheus/rules-1.14/kubernetes-resources.yaml   |  2 +-
 .../prometheus/rules-1.14/kubernetes-storage.yaml     |  2 +-
 .../rules-1.14/kubernetes-system-apiserver.yaml       |  2 +-
 .../kubernetes-system-controller-manager.yaml         |  2 +-
 .../rules-1.14/kubernetes-system-kubelet.yaml         |  2 +-
 .../rules-1.14/kubernetes-system-scheduler.yaml       |  2 +-
 .../prometheus/rules-1.14/kubernetes-system.yaml      |  2 +-
 .../prometheus/rules-1.14/node-exporter.rules.yaml    |  2 +-
 .../prometheus/rules-1.14/node-exporter.yaml          |  2 +-
 .../templates/prometheus/rules-1.14/node-network.yaml |  2 +-
 .../templates/prometheus/rules-1.14/node.rules.yaml   |  2 +-
 .../prometheus/rules-1.14/prometheus-operator.yaml    |  4 ++--
 .../templates/prometheus/rules-1.14/prometheus.yaml   |  4 ++--
 .../prometheus/rules/alertmanager.rules.yaml          |  4 ++--
 .../templates/prometheus/rules/etcd.yaml              |  2 +-
 .../templates/prometheus/rules/general.rules.yaml     |  2 +-
 .../templates/prometheus/rules/k8s.rules.yaml         |  2 +-
 .../prometheus/rules/kube-apiserver.rules.yaml        |  2 +-
 .../rules/kube-prometheus-node-alerting.rules.yaml    |  2 +-
 .../rules/kube-prometheus-node-recording.rules.yaml   |  2 +-
 .../prometheus/rules/kube-scheduler.rules.yaml        |  2 +-
 .../templates/prometheus/rules/kubernetes-absent.yaml |  4 ++--
 .../templates/prometheus/rules/kubernetes-apps.yaml   |  2 +-
 .../prometheus/rules/kubernetes-resources.yaml        |  2 +-
 .../prometheus/rules/kubernetes-storage.yaml          |  2 +-
 .../templates/prometheus/rules/kubernetes-system.yaml |  2 +-
 .../templates/prometheus/rules/node-network.yaml      |  2 +-
 .../templates/prometheus/rules/node-time.yaml         |  2 +-
 .../templates/prometheus/rules/node.rules.yaml        |  2 +-
 .../prometheus/rules/prometheus-operator.yaml         |  4 ++--
 .../templates/prometheus/rules/prometheus.rules.yaml  |  4 ++--
 .../templates/prometheus/service.yaml                 |  2 +-
 .../templates/prometheus/serviceaccount.yaml          |  2 +-
 .../templates/prometheus/servicemonitor.yaml          |  4 ++--
 .../templates/prometheus/servicemonitors.yaml         |  2 +-
 .../templates/prometheus/serviceperreplica.yaml       |  4 ++--
 stable/prometheus-operator/values.yaml                |  7 +++++++
 153 files changed, 199 insertions(+), 177 deletions(-)

diff --git a/stable/concourse/templates/web-rolebinding.yaml b/stable/concourse/templates/web-rolebinding.yaml
index c01524880ef8..05344d77f5b8 100644
--- a/stable/concourse/templates/web-rolebinding.yaml
+++ b/stable/concourse/templates/web-rolebinding.yaml
@@ -20,7 +20,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "concourse.web.fullname" $ }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
 {{- end -}}
 {{- end -}}
diff --git a/stable/couchdb/templates/_helpers.tpl b/stable/couchdb/templates/_helpers.tpl
index 0450a66ad6d5..9e0daec8b99f 100644
--- a/stable/couchdb/templates/_helpers.tpl
+++ b/stable/couchdb/templates/_helpers.tpl
@@ -58,6 +58,6 @@ Generates a comma delimited list of nodes in the cluster
 {{- $nodeCount :=  min 5 .Values.clusterSize | int }}
   {{- range $index0 := until $nodeCount -}}
     {{- $index1 := $index0 | add1 -}}
-    {{ $.Values.erlangFlags.name }}@{{ template "couchdb.fullname" $ }}-{{ $index0 }}.{{ template "couchdb.fullname" $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.dns.clusterDomainSuffix }}{{ if ne $index1 $nodeCount }},{{ end }}
+    {{ $.Values.erlangFlags.name }}@{{ template "couchdb.fullname" $ }}-{{ $index0 }}.{{ template "couchdb.fullname" $ }}.{{ template "prometheus-operator.namespace" . }}.svc.{{ $.Values.dns.clusterDomainSuffix }}{{ if ne $index1 $nodeCount }},{{ end }}
   {{- end -}}
 {{- end -}}
diff --git a/stable/datadog/templates/system-probe-configmap.yaml b/stable/datadog/templates/system-probe-configmap.yaml
index 65fc6d26f322..3e76822a634b 100644
--- a/stable/datadog/templates/system-probe-configmap.yaml
+++ b/stable/datadog/templates/system-probe-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "datadog.fullname" . }}-system-probe-config
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     app.kubernetes.io/name: "{{ template "datadog.fullname" . }}"
@@ -25,7 +25,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "datadog.fullname" . }}-security
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     app.kubernetes.io/name: "{{ template "datadog.fullname" . }}"
diff --git a/stable/minio/templates/statefulset.yaml b/stable/minio/templates/statefulset.yaml
index 8fb48a9346c2..740118867b8e 100644
--- a/stable/minio/templates/statefulset.yaml
+++ b/stable/minio/templates/statefulset.yaml
@@ -90,7 +90,7 @@ spec:
 
           command: [ "/bin/sh",
             "-ce",
-            "/usr/bin/docker-entrypoint.sh minio -S {{ .Values.certsPath }} server {{- range $i := until $zoneCount }}{{ $factor := mul $i $nodeCount }}{{ $endIndex := add $factor $nodeCount }}{{ $beginIndex := mul $i $nodeCount }}  {{ $scheme }}://{{ template `minio.fullname` $ }}-{{ `{` }}{{ $beginIndex }}...{{ sub $endIndex 1 }}{{ `}`}}.{{ template `minio.fullname` $ }}-svc.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{if (gt $drivesPerNode 1)}}{{ $bucketRoot }}-{{ `{` }}0...{{ sub $drivesPerNode 1 }}{{ `}` }}{{else}}{{ $bucketRoot }}{{end}}{{- end}}{{- template `minio.extraArgs` . }}" ]
+            "/usr/bin/docker-entrypoint.sh minio -S {{ .Values.certsPath }} server {{- range $i := until $zoneCount }}{{ $factor := mul $i $nodeCount }}{{ $endIndex := add $factor $nodeCount }}{{ $beginIndex := mul $i $nodeCount }}  {{ $scheme }}://{{ template `minio.fullname` $ }}-{{ `{` }}{{ $beginIndex }}...{{ sub $endIndex 1 }}{{ `}`}}.{{ template `minio.fullname` $ }}-svc.{{ template "prometheus-operator.namespace" . }}.svc.{{ $.Values.clusterDomain }}{{if (gt $drivesPerNode 1)}}{{ $bucketRoot }}-{{ `{` }}0...{{ sub $drivesPerNode 1 }}{{ `}` }}{{else}}{{ $bucketRoot }}{{end}}{{- end}}{{- template `minio.extraArgs` . }}" ]
           volumeMounts:
             {{- if $penabled }}
             {{- if (gt $drivesPerNode 1) }}
diff --git a/stable/mongodb/templates/prometheus-service-monitor.yaml b/stable/mongodb/templates/prometheus-service-monitor.yaml
index 8900b344f01f..25936944ef3a 100644
--- a/stable/mongodb/templates/prometheus-service-monitor.yaml
+++ b/stable/mongodb/templates/prometheus-service-monitor.yaml
@@ -25,7 +25,7 @@ spec:
   jobLabel: {{ template "mongodb.fullname" . }}
   namespaceSelector:
     matchNames:
-    - "{{ $.Release.Namespace }}"
+    - "{{ template "prometheus-operator.namespace" . }}"
   selector:
     matchLabels:
       app: {{ template "mongodb.name" . }}
diff --git a/stable/openebs/templates/psp-clusterrolebinding.yaml b/stable/openebs/templates/psp-clusterrolebinding.yaml
index 5a4205877bca..cfd7b503c69a 100644
--- a/stable/openebs/templates/psp-clusterrolebinding.yaml
+++ b/stable/openebs/templates/psp-clusterrolebinding.yaml
@@ -12,6 +12,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "openebs.serviceAccountName" . }}
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
 
diff --git a/stable/openebs/templates/psp.yaml b/stable/openebs/templates/psp.yaml
index 0442f0e5d7d6..3cb24d50d77f 100644
--- a/stable/openebs/templates/psp.yaml
+++ b/stable/openebs/templates/psp.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "openebs.fullname" . }}-psp
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "openebs.name" . }}
 spec:
diff --git a/stable/prometheus-blackbox-exporter/templates/servicemonitor.yaml b/stable/prometheus-blackbox-exporter/templates/servicemonitor.yaml
index 1af8119baaca..17712e18a4e8 100644
--- a/stable/prometheus-blackbox-exporter/templates/servicemonitor.yaml
+++ b/stable/prometheus-blackbox-exporter/templates/servicemonitor.yaml
@@ -39,7 +39,7 @@ spec:
       app.kubernetes.io/instance: {{ $.Release.Name }}
   namespaceSelector:
     matchNames:
-      - {{ $.Release.Namespace }}
+      - {{ template "prometheus-operator.namespace" . }}
 {{- end }}
 {{- end }}
 
diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml
index 836961e94cb7..2d7eb6f12006 100644
--- a/stable/prometheus-operator/Chart.yaml
+++ b/stable/prometheus-operator/Chart.yaml
@@ -12,7 +12,7 @@ sources:
   - /~https://github.com/coreos/kube-prometheus
   - /~https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 8.13.7
+version: 8.14.0
 appVersion: 0.38.1
 tillerVersion: ">=2.12.0"
 home: /~https://github.com/coreos/prometheus-operator
diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md
index f2a1914bbd91..82944982548e 100644
--- a/stable/prometheus-operator/README.md
+++ b/stable/prometheus-operator/README.md
@@ -173,6 +173,7 @@ The following tables list the configurable parameters of the prometheus-operator
 | `global.rbac.pspAnnotations` | Add annotations to the PSP configurations | `{}` |
 | `kubeTargetVersionOverride` | Provide a target gitVersion of K8S, in case .Capabilites.KubeVersion is not available (e.g. `helm template`) |`""`|
 | `nameOverride` | Provide a name in place of `prometheus-operator` |`""`|
+| `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) |
 | `kubeTargetVersionOverride` | Provide a k8s version |`""`|
 
 ### Prometheus Operator
@@ -452,6 +453,7 @@ For a full list of configurable values please refer to the [Grafana chart](https
 | `grafana.ingress.hosts` | Ingress accepted hostnames for Grafana| `[]` |
 | `grafana.ingress.labels` | Custom labels for Grafana Ingress | `{}` |
 | `grafana.ingress.tls` | Ingress TLS configuration for Grafana | `[]` |
+| `grafana.namespaceOverride` | Override the deployment namespace of grafana | `""` (`Release.Namespace`) |
 | `grafana.rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires rbac.pspEnabled) | `true` |
 | `grafana.service.portName` | Allow to customize Grafana service portname. Will be used by servicemonitor as well | `service` |
 | `grafana.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the grafana instance. | `` |
@@ -475,6 +477,7 @@ For a full list of configurable values please refer to the [Grafana chart](https
 | `coreDns.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` |
 | `coreDns.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping CoreDns. | `` |
 | `coreDns.serviceMonitor.relabelings` | The `relabel_configs` for scraping CoreDNS. | `` |
+| `kube-state-metrics.namespaceOverride` | Override the deployment namespace of kube-state-metrics | `""` (`Release.Namespace`) |
 | `kube-state-metrics.podSecurityPolicy.enabled` | Create pod security policy resource for kube-state-metrics. | `true` |
 | `kube-state-metrics.rbac.create` | Create RBAC components in kube-state-metrics. See `global.rbac.create` | `true` |
 | `kubeApiServer.enabled` | Deploy `serviceMonitor` to scrape the Kubernetes API server | `true` |
@@ -562,6 +565,7 @@ For a full list of configurable values please refer to the [Grafana chart](https
 | `nodeExporter.serviceMonitor.metricRelabelings` | Metric relablings for the `prometheus-node-exporter` ServiceMonitor | `[]` |
 | `nodeExporter.serviceMonitor.relabelings` | The `relabel_configs` for scraping the `prometheus-node-exporter`. | `` |
 | `prometheus-node-exporter.extraArgs` | Additional arguments for the node exporter container | `["--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)", "--collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$"]` |
+| `prometheus-node-exporter.namespaceOverride` | Override the deployment namespace of node exporter | `""` (`Release.Namespace`) |
 | `prometheus-node-exporter.podLabels` | Additional labels for pods in the DaemonSet | `{"jobLabel":"node-exporter"}` |
 
 
diff --git a/stable/prometheus-operator/hack/sync_grafana_dashboards.py b/stable/prometheus-operator/hack/sync_grafana_dashboards.py
index 3e62f0ea8c29..a172a66f5d1b 100755
--- a/stable/prometheus-operator/hack/sync_grafana_dashboards.py
+++ b/stable/prometheus-operator/hack/sync_grafana_dashboards.py
@@ -78,7 +78,7 @@ def new_representer(dumper, data):
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%%s-%%s" (include "prometheus-operator.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/NOTES.txt b/stable/prometheus-operator/templates/NOTES.txt
index ce7dce22abf5..4ef1bc3c8dfb 100644
--- a/stable/prometheus-operator/templates/NOTES.txt
+++ b/stable/prometheus-operator/templates/NOTES.txt
@@ -1,5 +1,5 @@
 The Prometheus Operator has been installed. Check its status by running:
-  kubectl --namespace {{ $.Release.Namespace }} get pods -l "release={{ $.Release.Name }}"
+  kubectl --namespace {{ template "prometheus-operator.namespace" . }} get pods -l "release={{ $.Release.Name }}"
 
 Visit /~https://github.com/coreos/prometheus-operator for instructions on how
 to create & configure Alertmanager and Prometheus instances using the Operator.
\ No newline at end of file
diff --git a/stable/prometheus-operator/templates/_helpers.tpl b/stable/prometheus-operator/templates/_helpers.tpl
index f4a8f2bae02d..a7c481de5842 100644
--- a/stable/prometheus-operator/templates/_helpers.tpl
+++ b/stable/prometheus-operator/templates/_helpers.tpl
@@ -80,3 +80,14 @@ heritage: {{ $.Release.Service | quote }}
     {{ default "default" .Values.alertmanager.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "prometheus-operator.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml
index 19ae3cb463a2..d82b297f68d1 100644
--- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -20,7 +20,7 @@ spec:
 {{- else if and .Values.alertmanager.ingress.enabled .Values.alertmanager.ingress.hosts }}
   externalUrl: "http://{{ index .Values.alertmanager.ingress.hosts 0 }}{{ .Values.alertmanager.alertmanagerSpec.routePrefix }}"
 {{- else }}
-  externalUrl: http://{{ template "prometheus-operator.fullname" . }}-alertmanager.{{ $.Release.Namespace }}:{{ .Values.alertmanager.service.port }}
+  externalUrl: http://{{ template "prometheus-operator.fullname" . }}-alertmanager.{{ template "prometheus-operator.namespace" . }}:{{ .Values.alertmanager.service.port }}
 {{- end }}
 {{- if .Values.alertmanager.alertmanagerSpec.nodeSelector }}
   nodeSelector:
diff --git a/stable/prometheus-operator/templates/alertmanager/ingress.yaml b/stable/prometheus-operator/templates/alertmanager/ingress.yaml
index 66bb34abbbcc..41bdcd03a5ea 100644
--- a/stable/prometheus-operator/templates/alertmanager/ingress.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/ingress.yaml
@@ -11,7 +11,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $serviceName }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- if .Values.alertmanager.ingress.annotations }}
   annotations:
 {{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }}
diff --git a/stable/prometheus-operator/templates/alertmanager/ingressperreplica.yaml b/stable/prometheus-operator/templates/alertmanager/ingressperreplica.yaml
index 6755ca1fc950..678dec914ea1 100644
--- a/stable/prometheus-operator/templates/alertmanager/ingressperreplica.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/ingressperreplica.yaml
@@ -6,7 +6,7 @@ apiVersion: v1
 kind: List
 metadata:
   name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-ingressperreplica
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 items:
 {{ range $i, $e := until $count }}
   - kind: Ingress
@@ -17,7 +17,7 @@ items:
     {{ end -}}
     metadata:
       name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ include "prometheus-operator.name" $ }}-alertmanager
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml
index 6cf4d166bc27..963b7c6ac28a 100644
--- a/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/alertmanager/psp-role.yaml b/stable/prometheus-operator/templates/alertmanager/psp-role.yaml
index 6d863660cb3e..c3f8b4b42f09 100644
--- a/stable/prometheus-operator/templates/alertmanager/psp-role.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/psp-role.yaml
@@ -3,7 +3,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml b/stable/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml
index bce7349cec4c..797150336ad2 100644
--- a/stable/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -14,5 +14,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }}
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
diff --git a/stable/prometheus-operator/templates/alertmanager/psp.yaml b/stable/prometheus-operator/templates/alertmanager/psp.yaml
index cbc0bb85674f..7c9949c2db27 100644
--- a/stable/prometheus-operator/templates/alertmanager/psp.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/psp.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{- if .Values.global.rbac.pspAnnotations }}
diff --git a/stable/prometheus-operator/templates/alertmanager/secret.yaml b/stable/prometheus-operator/templates/alertmanager/secret.yaml
index 86905530f719..a543bbf60d0e 100644
--- a/stable/prometheus-operator/templates/alertmanager/secret.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- if .Values.alertmanager.secret.annotations }}
   annotations:
 {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }}
diff --git a/stable/prometheus-operator/templates/alertmanager/service.yaml b/stable/prometheus-operator/templates/alertmanager/service.yaml
index 8313ec9ee7e5..8324e3b662cb 100644
--- a/stable/prometheus-operator/templates/alertmanager/service.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/service.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
     self-monitor: {{ .Values.alertmanager.serviceMonitor.selfMonitor | quote }}
diff --git a/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml
index d0fe2d61af70..5e13f68c9e8f 100644
--- a/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml
index c3b628aeab75..6e90d327d7bd 100644
--- a/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -15,7 +15,7 @@ spec:
       self-monitor: "true"
   namespaceSelector:
     matchNames:
-      - {{ $.Release.Namespace | quote }}
+      - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }}
   endpoints:
   - port: {{ .Values.alertmanager.alertmanagerSpec.portName }}
     {{- if .Values.alertmanager.serviceMonitor.interval }}
diff --git a/stable/prometheus-operator/templates/alertmanager/serviceperreplica.yaml b/stable/prometheus-operator/templates/alertmanager/serviceperreplica.yaml
index 838d6a24bea4..d876c8385a9f 100644
--- a/stable/prometheus-operator/templates/alertmanager/serviceperreplica.yaml
+++ b/stable/prometheus-operator/templates/alertmanager/serviceperreplica.yaml
@@ -5,14 +5,14 @@ apiVersion: v1
 kind: List
 metadata:
   name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-serviceperreplica
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 items:
 {{- range $i, $e := until $count }}
   - apiVersion: v1
     kind: Service
     metadata:
       name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ include "prometheus-operator.name" $ }}-alertmanager
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml
index 4dd430ca80bb..fa3ad9cd7114 100644
--- a/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-coredns
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-coredns
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml
index 401dd9e36e59..f4945771e0eb 100644
--- a/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-apiserver
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-apiserver
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml
index 52a344df62fd..7edc60bada7a 100644
--- a/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kube-controller-manager
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml
index 8d22f8586c2f..19ce523deb44 100644
--- a/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kube-dns
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kube-dns
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml
index 53221a1eab8b..4c716606a441 100644
--- a/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kube-etcd
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kube-etcd
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml
index 7e0db18cfd84..16bc28bb64a8 100644
--- a/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kube-proxy
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kube-proxy
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml
index 01a2bee2ae27..08795f41207f 100644
--- a/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kube-scheduler
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml
index 73e0161b38e4..3630361b8008 100644
--- a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kube-state-metrics
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kube-state-metrics
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml
index fe78e73d418a..344ec759347d 100644
--- a/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-kubelet
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-kubelet
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml
index be5e00dd6c59..82efdbf749f1 100644
--- a/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-node-exporter
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-node-exporter
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml
index 97934ac2c4bf..7fb8efa8546f 100644
--- a/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml
+++ b/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml
@@ -10,7 +10,7 @@ items:
   kind: ConfigMap
   metadata:
     name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }}
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
     labels:
       {{- if $.Values.grafana.sidecar.dashboards.label }}
       {{ $.Values.grafana.sidecar.dashboards.label }}: "1"
diff --git a/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml
index 3f92aa31f629..4c3adab123cb 100644
--- a/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml
+++ b/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-grafana-datasource
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- if .Values.grafana.sidecar.datasources.annotations }}
   annotations:
 {{ toYaml .Values.grafana.sidecar.datasources.annotations | indent 4 }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml
index 1d67b3362904..627def907d25 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml
index 04f70083053d..ab5bc59e26f7 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml
index c4eebdb81d2e..985a7290e798 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml
index 4379c9cfe473..e0c5b74a6ba8 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml
index ec4e91b59138..032672eee331 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml
@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml
index 4ff6b0cc8916..f9f9627dc5dd 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml
index cbea3588b59a..2823e136a326 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml
index 0e467efd7359..41d131f4242d 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml
index b598df35a899..b3a557d5f0dd 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml
index ca358a0acaf7..4e3cbe9e9900 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml
index e40dcc41ddc5..608ebf068edf 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml
index 901147b1265c..9adb763d7644 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml
index 219ce22a6a22..1a7e962725d4 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml
index 7cea4a34170b..67f20234bf11 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml
index 921503a55863..0aca3933ac34 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml
index c1dfdf266950..1cffc373bf53 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml
index c208025f5921..4277340de7c3 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml
index e74ee3141cc2..f5db115655e0 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml
index 697e859383ec..a26cf9f0b10e 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml
index ca0d3f00195e..6af1b5bfc2d2 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml
index da175552b19e..ff7cc859fb4c 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml
index 6b1f5565e7fb..e64d85e7cf2b 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml
index f7a3fd088ee1..54a9b4e87225 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml
index 003decda44b7..75d930e190a2 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml
index aa71d5e434fc..a2addf8c3ab9 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml
index ad7835909399..f264e405cd55 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml
index 938bcf4cc0dd..ea8b5c93dfdc 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml
index 04b407e6007d..d70eaf84282e 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml
index 1b516463618d..2ceb1ebb7e8d 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml
index 7b3914df437e..6b2f1124ad0e 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml
index 863c89b127f4..01a33e239ade 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml
index e334663db11f..5fb05151ab08 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml
index 5b8d27be3b8f..e0d7e32af9b6 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml
index 780b48012596..997c59d14ddf 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml
index c701deca16ce..ac0a0eebeb0e 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml b/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml
index 7698ff151729..dce321556925 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pods" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml
index 3476901f3cbd..1d73658942bf 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml
@@ -8,7 +8,7 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }}
   labels:
     {{- if $.Values.grafana.sidecar.dashboards.label }}
diff --git a/stable/prometheus-operator/templates/grafana/servicemonitor.yaml b/stable/prometheus-operator/templates/grafana/servicemonitor.yaml
index cbbbba8bbf1f..daf72b335f57 100644
--- a/stable/prometheus-operator/templates/grafana/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/grafana/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-grafana
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-grafana
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -14,7 +14,7 @@ spec:
       app.kubernetes.io/instance: {{ $.Release.Name | quote }}
   namespaceSelector:
     matchNames:
-      - {{ $.Release.Namespace | quote }}
+      - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }}
   endpoints:
   - port: {{ .Values.grafana.service.portName }}
     {{- if .Values.grafana.serviceMonitor.interval }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml
index 63bb2cc18be7..a1313b9a990d 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name:  {{ template "prometheus-operator.fullname" . }}-admission
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -17,5 +17,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.fullname" . }}-admission
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
index cc79e0851eef..4ac43b999155 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
@@ -3,7 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name:  {{ template "prometheus-operator.fullname" . }}-admission-create
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -35,8 +35,8 @@ spec:
           imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.pullPolicy }}
           args:
             - create
-            - --host={{ template "prometheus-operator.operator.fullname" . }},{{ template "prometheus-operator.operator.fullname" . }}.{{ $.Release.Namespace }}.svc
-            - --namespace={{ $.Release.Namespace }}
+            - --host={{ template "prometheus-operator.operator.fullname" . }},{{ template "prometheus-operator.operator.fullname" . }}.{{ template "prometheus-operator.namespace" . }}.svc
+            - --namespace={{ template "prometheus-operator.namespace" . }}
             - --secret-name={{ template "prometheus-operator.fullname" . }}-admission
           resources:
 {{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
index 51505b67b965..a2d629ab0bea 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -3,7 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name:  {{ template "prometheus-operator.fullname" . }}-admission-patch
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -36,7 +36,7 @@ spec:
           args:
             - patch
             - --webhook-name={{ template "prometheus-operator.fullname" . }}-admission
-            - --namespace={{ $.Release.Namespace }}
+            - --namespace={{ template "prometheus-operator.namespace" . }}
             - --secret-name={{ template "prometheus-operator.fullname" . }}-admission
             - --patch-failure-policy={{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }}
           resources:
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml
index b27c92bf149a..782157802a59 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-admission
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml
index f5941fc7f040..5ead639f574f 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name:  {{ template "prometheus-operator.fullname" . }}-admission
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml
index 416cd3898a88..aa6a4fc017b8 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name:  {{ template "prometheus-operator.fullname" . }}-admission
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -17,5 +17,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.fullname" . }}-admission
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml
index 440644f8eaad..b3052e0daa35 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name:  {{ template "prometheus-operator.fullname" . }}-admission
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml
index 97214ca3ea45..30319453f49c 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml
@@ -25,7 +25,7 @@ webhooks:
           - UPDATE
     clientConfig:
       service:
-        namespace: {{ $.Release.Namespace }}
+        namespace: {{ template "prometheus-operator.namespace" . }}
         name: {{ template "prometheus-operator.operator.fullname" $ }}
         path: /admission-prometheusrules/mutate
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml
index 6616f212d7a1..3d26f46798d8 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml
@@ -25,7 +25,7 @@ webhooks:
           - UPDATE
     clientConfig:
       service:
-        namespace: {{ $.Release.Namespace }}
+        namespace: {{ template "prometheus-operator.namespace" . }}
         name: {{ template "prometheus-operator.operator.fullname" $ }}
         path: /admission-prometheusrules/validate
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml
index 6dacccc572d9..7329701f1f56 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml
@@ -3,7 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-weight": "3"
diff --git a/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml
index 22568f329e51..f2ac0d9961ea 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml
@@ -13,5 +13,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "prometheus-operator.operator.serviceAccountName" . }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml
index e5b28a7509d6..02df14243660 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-operator
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-operator
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -50,7 +50,7 @@ spec:
           {{- with $.Values.prometheusOperator.namespaces }}
           {{ $ns := .additional }}
           {{- if .releaseNamespace }}
-          {{- $ns = append $ns $.Release.Namespace }}
+          {{- $ns = printf "%s" (include "prometheus-operator.namespace" .) | append $ns }}
           {{- end }}
             - --namespaces={{ $ns | join "," }}
           {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml
index e51250bd37e0..07404127533a 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml
@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.operator.serviceAccountName" . }}
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml
index 31d8849392ff..a48c89b99d3b 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-operator
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-operator
 {{- if .Values.global.rbac.pspAnnotations }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/service.yaml b/stable/prometheus-operator/templates/prometheus-operator/service.yaml
index 2a47686cdab1..b5d75b0fc7ba 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/service.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/service.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-operator
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-operator
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
index d2055c7a447d..637ed3fe091d 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "prometheus-operator.operator.serviceAccountName" . }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-operator
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml
index ec8d0d7e9a47..dfda03ab7c46 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-operator
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-operator
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -28,5 +28,5 @@ spec:
       release: {{ $.Release.Name | quote }}
   namespaceSelector:
     matchNames:
-      - {{ $.Release.Namespace | quote }}
+      - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }}
 {{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml
index 5e19878a0d9f..33227dc56721 100644
--- a/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml
+++ b/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-relabel-confg
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }}
   annotations:
 {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml
index b495f8ad19c0..61ba8c00763b 100644
--- a/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml
+++ b/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-confg
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }}
   annotations:
 {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml
index 957b23a10445..bc631fc83c40 100644
--- a/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml
@@ -8,7 +8,7 @@ items:
     kind: PrometheusRule
     metadata:
       name: {{ template "prometheus-operator.name" $ }}-{{ $prometheusRuleName }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ template "prometheus-operator.name" $ }}
 {{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -25,7 +25,7 @@ items:
     kind: PrometheusRule
     metadata:
       name: {{ template "prometheus-operator.name" $ }}-{{ .name }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ template "prometheus-operator.name" $ }}
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml
index 66efb095fa92..1158b3467c64 100644
--- a/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml
+++ b/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus-scrape-confg
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }}
   annotations:
 {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml
index cbae4e257b3b..c31952330845 100644
--- a/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml
+++ b/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml
@@ -13,6 +13,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }}
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
 
diff --git a/stable/prometheus-operator/templates/prometheus/ingress.yaml b/stable/prometheus-operator/templates/prometheus/ingress.yaml
index b17ec4fb608d..2a9c4e6080f4 100644
--- a/stable/prometheus-operator/templates/prometheus/ingress.yaml
+++ b/stable/prometheus-operator/templates/prometheus/ingress.yaml
@@ -15,7 +15,7 @@ metadata:
 {{ toYaml .Values.prometheus.ingress.annotations | indent 4 }}
 {{- end }}
   name: {{ $serviceName }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml b/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml
index bbfab9610bbb..57283b221f58 100644
--- a/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml
+++ b/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml
@@ -6,7 +6,7 @@ apiVersion: v1
 kind: List
 metadata:
   name: {{ include "prometheus-operator.fullname" $ }}-prometheus-ingressperreplica
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 items:
 {{ range $i, $e := until $count }}
   - kind: Ingress
@@ -17,7 +17,7 @@ items:
     {{ end -}}
     metadata:
       name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ include "prometheus-operator.name" $ }}-prometheus
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
index c0bb5995ff58..2853ac73b42e 100644
--- a/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
+++ b/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/podmonitors.yaml b/stable/prometheus-operator/templates/prometheus/podmonitors.yaml
index a0e547e0a3eb..88789557edec 100644
--- a/stable/prometheus-operator/templates/prometheus/podmonitors.yaml
+++ b/stable/prometheus-operator/templates/prometheus/podmonitors.yaml
@@ -7,7 +7,7 @@ items:
     kind: PodMonitor
     metadata:
       name: {{ .name }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ template "prometheus-operator.name" $ }}-prometheus
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml
index 8b456b617578..5b10418fb4e3 100644
--- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml
+++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -17,7 +17,7 @@ spec:
 {{- if .Values.prometheus.prometheusSpec.alertingEndpoints }}
 {{ toYaml .Values.prometheus.prometheusSpec.alertingEndpoints | indent 6 }}
 {{- else if .Values.alertmanager.enabled }}
-      - namespace: {{ $.Release.Namespace }}
+      - namespace: {{ template "prometheus-operator.namespace" . }}
         name: {{ template "prometheus-operator.fullname" . }}-alertmanager
         port: {{ .Values.alertmanager.alertmanagerSpec.portName }}
         {{- if .Values.alertmanager.alertmanagerSpec.routePrefix }}
@@ -54,7 +54,7 @@ spec:
 {{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }}
   externalUrl: "http://{{ index .Values.prometheus.ingress.hosts 0 }}{{ .Values.prometheus.prometheusSpec.routePrefix }}"
 {{- else }}
-  externalUrl: http://{{ template "prometheus-operator.fullname" . }}-prometheus.{{ $.Release.Namespace }}:{{ .Values.prometheus.service.port }}
+  externalUrl: http://{{ template "prometheus-operator.fullname" . }}-prometheus.{{ template "prometheus-operator.namespace" . }}:{{ .Values.prometheus.service.port }}
 {{- end }}
 {{- if .Values.prometheus.prometheusSpec.nodeSelector }}
   nodeSelector:
diff --git a/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml
index 596273c46bc9..cf26f49d1121 100644
--- a/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml
+++ b/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml
@@ -13,6 +13,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }}
-    namespace: {{ $.Release.Namespace }}
+    namespace: {{ template "prometheus-operator.namespace" . }}
 {{- end }}
 
diff --git a/stable/prometheus-operator/templates/prometheus/psp.yaml b/stable/prometheus-operator/templates/prometheus/psp.yaml
index e31dd7da30df..6a238f88b99f 100644
--- a/stable/prometheus-operator/templates/prometheus/psp.yaml
+++ b/stable/prometheus-operator/templates/prometheus/psp.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
 {{- if .Values.global.rbac.pspAnnotations }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml
index 974346dfb819..1c6db4095d21 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml
@@ -7,12 +7,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }}
 {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }}
 {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml
index 09fa80a44f5c..c264707a1940 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml
index 9cecf35e08ed..4ccd9441cf38 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml
index 2db65338b5b1..4bc2cc7df5b0 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml
index f9a1dff5c669..3246c0648dd3 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver-slos" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml
index 06d6351415f0..1b00134e8734 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml
index d93547b175cd..0b9632763536 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-general.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml
index e41fc46b0bac..1ff4cb076fe0 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml
index 53d730a43d3d..ec718ceffa5c 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml
index 56a1891323d4..6f281bcbe6b3 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-state-metrics" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml
index f21f36c4ca4e..9d9fa95093c2 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml
index 8e64868d67d7..3ae09119ae84 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml
@@ -10,7 +10,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml
index 105bd542f8a2..0247f5ebc58f 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml
index 2d755596db4e..f2573966a134 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml
@@ -10,7 +10,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml
index f975a51636b6..7583a599b8e5 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-apiserver" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml
index e758e35b0daf..6214d7751043 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-controller-manager" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml
index 38050de6f428..ca077160ed29 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-kubelet" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml
index e2b84b5d9526..84e3b1abd85f 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-scheduler" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml
index 83b348f7e4d0..fc455f375af0 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml
index b52853545add..7adf85db3679 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-exporter.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml
index 75e0b27916be..7b6c601ba3a3 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml
index 0bba952b6128..b4b206d860c8 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml
index 35a11ac52e55..75ab27edf676 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml
index 492966e9e1e1..98f2d3bc008c 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml
@@ -6,12 +6,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }}
 {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus-operator" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml
index bbd51e219fa9..71883f7efa26 100644
--- a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml
@@ -6,12 +6,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }}
 {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml
index f1a7400042fa..5444023970eb 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml
@@ -7,12 +7,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }}
 {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }}
 {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml b/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml
index 5de9b8328677..208e69b21eaf 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml
index 74823b884422..d220cb3898f9 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml
index 5f8917cee546..71c75fcc4f62 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml
index a576d56da26a..5e565317b973 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml
index 741f5a7bcb2c..09a7c754ae29 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-node-alerting.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml
index 26089fcf33d8..fc0f48305f82 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml
index 5d52b74d8842..3861fa639871 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml
index 41beceab027a..7391f16ba361 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml
@@ -8,12 +8,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }}
 {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }}
 {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml
index 3e8a8b2981f5..fa82f0811f06 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml
@@ -10,7 +10,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml
index cc1bee73475f..ee51ebd0721c 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml
index 2962407fc208..715924b863c1 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml
@@ -10,7 +10,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml
index a12a3c0fa956..36a119314521 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml b/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml
index 10e1640362c7..1de2a621c19a 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml b/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml
index 00b9d4b170e7..b53a6af2c659 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml
index 8273441eabc1..bd2c50fe5ac3 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml
@@ -9,7 +9,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml
index fa109c40db22..9975be3691ea 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml
@@ -6,12 +6,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }}
 {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus-operator" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml
index 82f19dadeac6..9cd2eea08ce3 100644
--- a/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml
+++ b/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml
@@ -6,12 +6,12 @@ /~https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
 {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }}
 {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/service.yaml b/stable/prometheus-operator/templates/prometheus/service.yaml
index be9cb259383d..e38b4813a712 100644
--- a/stable/prometheus-operator/templates/prometheus/service.yaml
+++ b/stable/prometheus-operator/templates/prometheus/service.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
     self-monitor: {{ .Values.prometheus.serviceMonitor.selfMonitor | quote }}
diff --git a/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml
index ba6e49e88b5a..273e79f6e337 100644
--- a/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml
+++ b/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
 {{ include "prometheus-operator.labels" . | indent 4 }}
diff --git a/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml b/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml
index e2b6044a51cc..26addda30a54 100644
--- a/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml
+++ b/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
   labels:
     app: {{ template "prometheus-operator.name" . }}-prometheus
 {{ include "prometheus-operator.labels" . | indent 4 }}
@@ -15,7 +15,7 @@ spec:
       self-monitor: "true"
   namespaceSelector:
     matchNames:
-      - {{ $.Release.Namespace | quote }}
+      - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }}
   endpoints:
   - port: {{ .Values.prometheus.prometheusSpec.portName }}
     {{- if .Values.prometheus.serviceMonitor.interval }}
diff --git a/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml b/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml
index cdfef1a3d0b3..95e55d308d47 100644
--- a/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml
+++ b/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml
@@ -7,7 +7,7 @@ items:
     kind: ServiceMonitor
     metadata:
       name: {{ .name }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ template "prometheus-operator.name" $ }}-prometheus
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml
index a57c0b2db37f..791057b725a6 100644
--- a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml
+++ b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml
@@ -5,14 +5,14 @@ apiVersion: v1
 kind: List
 metadata:
   name: {{ include "prometheus-operator.fullname" $ }}-prometheus-serviceperreplica
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ template "prometheus-operator.namespace" . }}
 items:
 {{- range $i, $e := until $count }}
   - apiVersion: v1
     kind: Service
     metadata:
       name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }}
-      namespace: {{ $.Release.Namespace }}
+      namespace: {{ template "prometheus-operator.namespace" . }}
       labels:
         app: {{ include "prometheus-operator.name" $ }}-prometheus
 {{ include "prometheus-operator.labels" $ | indent 8 }}
diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml
index 70b4126e5ad2..2762db80e61e 100644
--- a/stable/prometheus-operator/values.yaml
+++ b/stable/prometheus-operator/values.yaml
@@ -6,6 +6,10 @@
 ##
 nameOverride: ""
 
+## Override the deployment namespace
+##
+namespaceOverride: ""
+
 ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6
 ##
 kubeTargetVersionOverride: ""
@@ -471,6 +475,7 @@ alertmanager:
 ##
 grafana:
   enabled: true
+  namespaceOverride: ""
 
   ## Deploy default dashboards.
   ##
@@ -1009,6 +1014,7 @@ kubeStateMetrics:
 ## Configuration for kube-state-metrics subchart
 ##
 kube-state-metrics:
+  namespaceOverride: ""
   rbac:
     create: true
   podSecurityPolicy:
@@ -1054,6 +1060,7 @@ nodeExporter:
 ## Configuration for prometheus-node-exporter subchart
 ##
 prometheus-node-exporter:
+  namespaceOverride: ""
   podLabels:
     ## Add the 'node-exporter' label to be used by serviceMonitor to match standard common usage in rules and grafana dashboards
     ##