diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index aa9bae638ebf44e5086527b886426299ed7380a5..2502bf63c9fc5392700b926db4a4d03b03159c99 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -29,12 +29,4 @@ Create chart name and version as used by the chart label.
 */}}
 {{- define "mongodb.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "mongodb.metricsSecret" -}}
-    {{- if .Values.auth.existingMetricsSecret -}}
-        {{- .Values.auth.existingMetricsSecret -}}
-    {{- else -}}
-        {{- template "mongodb.fullname" . -}}-metrics
-    {{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/templates/mongodb-service.yaml b/templates/mongodb-service.yaml
index 5794ebfe07c42461b1bf31deecb985e2b13526ab..80f4cc922462ef96149ac7e175e7a2b8bea5d502 100644
--- a/templates/mongodb-service.yaml
+++ b/templates/mongodb-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "mongodb.name" . }}
-  namespace: {{ template "mongodb.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     name: {{ template "mongodb.name" . }}
 spec:
diff --git a/templates/mongodb-statefulset.yaml b/templates/mongodb-statefulset.yaml
index 11b35b0c5c4752e4c983368c0e835974425e1418..57f027943df1a82a7648ac9ea21ca2b45cd38b24 100644
--- a/templates/mongodb-statefulset.yaml
+++ b/templates/mongodb-statefulset.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "mongodb.name" . }}
-  namespace: {{ template "mongodb.name" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.replicas }}
   selector: