diff --git a/charts/databunker/templates/pv.yaml b/charts/databunker/templates/pv.yaml
index 6665fc2..e169b2d 100644
--- a/charts/databunker/templates/pv.yaml
+++ b/charts/databunker/templates/pv.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: {{ include "common.names.fullname" . }}-databunker
+  namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/charts/databunker/templates/pvc.yaml b/charts/databunker/templates/pvc.yaml
index e290995..268c08c 100644
--- a/charts/databunker/templates/pvc.yaml
+++ b/charts/databunker/templates/pvc.yaml
@@ -3,6 +3,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ include "common.names.fullname" . }}-databunker
+  namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/charts/databunker/templates/secrets.yaml b/charts/databunker/templates/secrets.yaml
index d31b50e..5a06a2f 100644
--- a/charts/databunker/templates/secrets.yaml
+++ b/charts/databunker/templates/secrets.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "common.names.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
@@ -22,7 +23,4 @@ data:
   {{- else }}
   databunker-roottoken: {{ uuidv4 | b64enc | quote }}
   {{- end }}
-  {{- if .Values.smtpPassword }}
-  smtp-password: {{ .Values.smtpPassword | b64enc | quote }}
-  {{- end }}
 {{- end }}