diff --git a/bitnami/dataplatform-bp1/Chart.yaml b/bitnami/dataplatform-bp1/Chart.yaml
index be2e8055b..0aebad353 100644
--- a/bitnami/dataplatform-bp1/Chart.yaml
+++ b/bitnami/dataplatform-bp1/Chart.yaml
@@ -59,4 +59,4 @@ sources:
   - https://github.com/bitnami/bitnami-docker-wavefront-proxy
   - https://github.com/wavefrontHQ/wavefront-collector-for-kubernetes
   - https://github.com/wavefrontHQ/wavefront-proxy
-version: 12.0.0
+version: 12.0.1
diff --git a/bitnami/dataplatform-bp1/templates/configmap.yaml b/bitnami/dataplatform-bp1/templates/configmap.yaml
index a89612589..997aae2d7 100644
--- a/bitnami/dataplatform-bp1/templates/configmap.yaml
+++ b/bitnami/dataplatform-bp1/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "dataplatform.exporter-name" . }}-configuration
+  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/bitnami/dataplatform-bp1/templates/role.yaml b/bitnami/dataplatform-bp1/templates/role.yaml
index b6ff21077..554152e79 100644
--- a/bitnami/dataplatform-bp1/templates/role.yaml
+++ b/bitnami/dataplatform-bp1/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: Role
 metadata:
   name: {{ template "dataplatform.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     app.kubernetes.io/component: dataplatform
     {{- if .Values.commonLabels }}
diff --git a/bitnami/dataplatform-bp1/templates/rolebinding.yaml b/bitnami/dataplatform-bp1/templates/rolebinding.yaml
index bcd5c33e5..cea81b90f 100644
--- a/bitnami/dataplatform-bp1/templates/rolebinding.yaml
+++ b/bitnami/dataplatform-bp1/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: RoleBinding
 metadata:
   name: {{ template "dataplatform.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     app.kubernetes.io/component: dataplatform
     {{- if .Values.commonLabels }}
@@ -18,5 +19,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "dataplatform.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Release.Namespace | quote }}
 {{- end }}
diff --git a/bitnami/dataplatform-bp1/templates/serviceaccount.yaml b/bitnami/dataplatform-bp1/templates/serviceaccount.yaml
index bb2b2a24f..9f360d08d 100644
--- a/bitnami/dataplatform-bp1/templates/serviceaccount.yaml
+++ b/bitnami/dataplatform-bp1/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "dataplatform.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     app.kubernetes.io/component: dataplatform
     {{- if .Values.commonLabels }}