diff --git a/charts/promitor-agent-resource-discovery/templates/configmap.yaml b/charts/promitor-agent-resource-discovery/templates/configmap.yaml
index 80d868999..974e97b64 100644
--- a/charts/promitor-agent-resource-discovery/templates/configmap.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/configmap.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-map-{{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 data:
diff --git a/charts/promitor-agent-resource-discovery/templates/deployment.yaml b/charts/promitor-agent-resource-discovery/templates/deployment.yaml
index 11eeedfb8..45926188e 100644
--- a/charts/promitor-agent-resource-discovery/templates/deployment.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 spec:
diff --git a/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml b/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml
index 20456ae44..fb66098dd 100644
--- a/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 spec:
diff --git a/charts/promitor-agent-resource-discovery/templates/role.yaml b/charts/promitor-agent-resource-discovery/templates/role.yaml
index 128431fb4..a2e3cfcf8 100644
--- a/charts/promitor-agent-resource-discovery/templates/role.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 rules:
diff --git a/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml b/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml
index df640597c..ebd69b590 100644
--- a/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 roleRef:
diff --git a/charts/promitor-agent-resource-discovery/templates/secret.yaml b/charts/promitor-agent-resource-discovery/templates/secret.yaml
index 64f8991ea..d2ab19f95 100644
--- a/charts/promitor-agent-resource-discovery/templates/secret.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "promitor-agent-resource-discovery.secretname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 type: Opaque
diff --git a/charts/promitor-agent-resource-discovery/templates/service.yaml b/charts/promitor-agent-resource-discovery/templates/service.yaml
index 286e29393..90ba39ee1 100644
--- a/charts/promitor-agent-resource-discovery/templates/service.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 {{- if and (.Values.service.loadBalancer.enabled) (.Values.service.loadBalancer.dnsPrefix) }}
diff --git a/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml b/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml
index 37849b575..6e1332dfd 100644
--- a/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml
+++ b/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "promitor-agent-resource-discovery.serviceaccountname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
   {{- if .Values.rbac.serviceAccount.annotations }}
diff --git a/charts/promitor-agent-scraper/templates/configmap.yaml b/charts/promitor-agent-scraper/templates/configmap.yaml
index 5b3cb97b8..cb29fcd48 100644
--- a/charts/promitor-agent-scraper/templates/configmap.yaml
+++ b/charts/promitor-agent-scraper/templates/configmap.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-map-{{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 data:
diff --git a/charts/promitor-agent-scraper/templates/deployment.yaml b/charts/promitor-agent-scraper/templates/deployment.yaml
index 67f284bfe..adffd4860 100644
--- a/charts/promitor-agent-scraper/templates/deployment.yaml
+++ b/charts/promitor-agent-scraper/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 spec:
diff --git a/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml b/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml
index 6ba6efd71..48da02fae 100644
--- a/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml
+++ b/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 spec:
diff --git a/charts/promitor-agent-scraper/templates/role.yaml b/charts/promitor-agent-scraper/templates/role.yaml
index b953bd089..8157148b3 100644
--- a/charts/promitor-agent-scraper/templates/role.yaml
+++ b/charts/promitor-agent-scraper/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 rules:
diff --git a/charts/promitor-agent-scraper/templates/rolebinding.yaml b/charts/promitor-agent-scraper/templates/rolebinding.yaml
index 8c90c1592..a3ab26967 100644
--- a/charts/promitor-agent-scraper/templates/rolebinding.yaml
+++ b/charts/promitor-agent-scraper/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 roleRef:
diff --git a/charts/promitor-agent-scraper/templates/secret.yaml b/charts/promitor-agent-scraper/templates/secret.yaml
index 325ddabb9..d86098783 100644
--- a/charts/promitor-agent-scraper/templates/secret.yaml
+++ b/charts/promitor-agent-scraper/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "promitor-agent-scraper.secretname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 type: Opaque
diff --git a/charts/promitor-agent-scraper/templates/service.yaml b/charts/promitor-agent-scraper/templates/service.yaml
index 8e5719d50..a90fcec2a 100644
--- a/charts/promitor-agent-scraper/templates/service.yaml
+++ b/charts/promitor-agent-scraper/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 {{- if and (.Values.service.loadBalancer.enabled) (.Values.service.loadBalancer.dnsPrefix) }}
diff --git a/charts/promitor-agent-scraper/templates/serviceaccount.yaml b/charts/promitor-agent-scraper/templates/serviceaccount.yaml
index fb77dd8cc..10070b429 100644
--- a/charts/promitor-agent-scraper/templates/serviceaccount.yaml
+++ b/charts/promitor-agent-scraper/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "promitor-agent-scraper.serviceaccountname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
   {{- if .Values.rbac.serviceAccount.annotations }}