diff --git a/charts/telegraf-ds/templates/configmap.yaml b/charts/telegraf-ds/templates/configmap.yaml
index 9427e82e..56667c2f 100644
--- a/charts/telegraf-ds/templates/configmap.yaml
+++ b/charts/telegraf-ds/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "telegraf.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
 data:
diff --git a/charts/telegraf-ds/templates/daemonset.yaml b/charts/telegraf-ds/templates/daemonset.yaml
index abf69d03..e55b640d 100644
--- a/charts/telegraf-ds/templates/daemonset.yaml
+++ b/charts/telegraf-ds/templates/daemonset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "telegraf.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
 spec:
diff --git a/charts/telegraf-ds/templates/serviceaccount.yaml b/charts/telegraf-ds/templates/serviceaccount.yaml
index 8ed4588c..d4992525 100644
--- a/charts/telegraf-ds/templates/serviceaccount.yaml
+++ b/charts/telegraf-ds/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "telegraf.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/charts/telegraf/templates/configmap.yaml b/charts/telegraf/templates/configmap.yaml
index ceb4af75..80673d7f 100644
--- a/charts/telegraf/templates/configmap.yaml
+++ b/charts/telegraf/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "telegraf.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
 data:
diff --git a/charts/telegraf/templates/deployment.yaml b/charts/telegraf/templates/deployment.yaml
index b6d4f216..ec20ea24 100644
--- a/charts/telegraf/templates/deployment.yaml
+++ b/charts/telegraf/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "telegraf.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
 spec:
diff --git a/charts/telegraf/templates/pdb.yaml b/charts/telegraf/templates/pdb.yaml
index 8736293f..b8bcab24 100644
--- a/charts/telegraf/templates/pdb.yaml
+++ b/charts/telegraf/templates/pdb.yaml
@@ -7,6 +7,7 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "telegraf.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "telegraf.labels" . | nindent 4 }}
 spec:
diff --git a/charts/telegraf/templates/service.yaml b/charts/telegraf/templates/service.yaml
index a3ace349..1e17bcdc 100644
--- a/charts/telegraf/templates/service.yaml
+++ b/charts/telegraf/templates/service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "telegraf.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
   {{- if .Values.service.annotations }}
diff --git a/charts/telegraf/templates/serviceaccount.yaml b/charts/telegraf/templates/serviceaccount.yaml
index 52989997..aec7cbfb 100644
--- a/charts/telegraf/templates/serviceaccount.yaml
+++ b/charts/telegraf/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "telegraf.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "telegraf.labels" . | nindent 4 }}
   {{- if .Values.serviceAccount.annotations }}