diff --git a/charts/nextcloud/templates/config.yaml b/charts/nextcloud/templates/config.yaml
index 8af94a3a..34d0e0fd 100644
--- a/charts/nextcloud/templates/config.yaml
+++ b/charts/nextcloud/templates/config.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "nextcloud.fullname" . }}-config
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "rootContext" $ ) | nindent 4 }}
 data:
diff --git a/charts/nextcloud/templates/configmap-hooks.yaml b/charts/nextcloud/templates/configmap-hooks.yaml
index f8e58e1d..4e67bdae 100644
--- a/charts/nextcloud/templates/configmap-hooks.yaml
+++ b/charts/nextcloud/templates/configmap-hooks.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "nextcloud.fullname" . }}-hooks
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "rootContext" $ ) | nindent 4 }}
 data:
diff --git a/charts/nextcloud/templates/cronjob.yaml b/charts/nextcloud/templates/cronjob.yaml
index 3a582b21..a7b90d67 100644
--- a/charts/nextcloud/templates/cronjob.yaml
+++ b/charts/nextcloud/templates/cronjob.yaml
@@ -5,6 +5,7 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ template "nextcloud.fullname" $ }}-cron
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "cronjob" "rootContext" $ ) | nindent 4 }}
     {{- with .labels }}
diff --git a/charts/nextcloud/templates/db-secret.yaml b/charts/nextcloud/templates/db-secret.yaml
index 4697e7dd..ca04fd17 100644
--- a/charts/nextcloud/templates/db-secret.yaml
+++ b/charts/nextcloud/templates/db-secret.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-db
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "rootContext" $ ) | nindent 4 }}
 type: Opaque
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
index 2e03dd60..9822cae7 100644
--- a/charts/nextcloud/templates/deployment.yaml
+++ b/charts/nextcloud/templates/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
     {{- with .Values.deploymentLabels }}
diff --git a/charts/nextcloud/templates/hpa.yaml b/charts/nextcloud/templates/hpa.yaml
index 17e839d9..23bcfc61 100644
--- a/charts/nextcloud/templates/hpa.yaml
+++ b/charts/nextcloud/templates/hpa.yaml
@@ -4,6 +4,7 @@ apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
 spec:
diff --git a/charts/nextcloud/templates/imaginary/deployment.yaml b/charts/nextcloud/templates/imaginary/deployment.yaml
index 8cfbe90b..427aad10 100644
--- a/charts/nextcloud/templates/imaginary/deployment.yaml
+++ b/charts/nextcloud/templates/imaginary/deployment.yaml
@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "nextcloud.fullname" . }}-imaginary
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "imaginary"  "rootContext" $ ) | nindent 4 }}
 spec:
diff --git a/charts/nextcloud/templates/imaginary/service.yaml b/charts/nextcloud/templates/imaginary/service.yaml
index 886a16d9..26b74b6e 100644
--- a/charts/nextcloud/templates/imaginary/service.yaml
+++ b/charts/nextcloud/templates/imaginary/service.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "nextcloud.fullname" . }}-imaginary
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "imaginary"  "rootContext" $ ) | nindent 4 }}
     {{- with .Values.imaginary.service.labels }}
diff --git a/charts/nextcloud/templates/ingress.yaml b/charts/nextcloud/templates/ingress.yaml
index 83768774..b31baeb4 100644
--- a/charts/nextcloud/templates/ingress.yaml
+++ b/charts/nextcloud/templates/ingress.yaml
@@ -4,6 +4,7 @@ apiVersion: {{ include "nextcloud.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
     {{- with .Values.ingress.labels }}
diff --git a/charts/nextcloud/templates/nextcloud-data-pvc.yaml b/charts/nextcloud/templates/nextcloud-data-pvc.yaml
index 38779155..8c9eb6ee 100644
--- a/charts/nextcloud/templates/nextcloud-data-pvc.yaml
+++ b/charts/nextcloud/templates/nextcloud-data-pvc.yaml
@@ -4,6 +4,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "nextcloud.fullname" . }}-nextcloud-data
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
   {{- with .Values.persistence.nextcloudData.labels }}
diff --git a/charts/nextcloud/templates/nextcloud-pvc.yaml b/charts/nextcloud/templates/nextcloud-pvc.yaml
index d38ad807..8162da6e 100644
--- a/charts/nextcloud/templates/nextcloud-pvc.yaml
+++ b/charts/nextcloud/templates/nextcloud-pvc.yaml
@@ -3,6 +3,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "nextcloud.fullname" . }}-nextcloud
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
   {{- with .Values.persistence.labels }}
diff --git a/charts/nextcloud/templates/nginx-config.yaml b/charts/nextcloud/templates/nginx-config.yaml
index c1389d24..71c11e1d 100644
--- a/charts/nextcloud/templates/nginx-config.yaml
+++ b/charts/nextcloud/templates/nginx-config.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "nextcloud.fullname" . }}-nginxconfig
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "rootContext" $ ) | nindent 4 }}
 data:
diff --git a/charts/nextcloud/templates/php-config.yaml b/charts/nextcloud/templates/php-config.yaml
index 08fa3dc2..a6bd1a25 100644
--- a/charts/nextcloud/templates/php-config.yaml
+++ b/charts/nextcloud/templates/php-config.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "nextcloud.fullname" . }}-phpconfig
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "rootContext" $ ) | nindent 4 }}
 data:
diff --git a/charts/nextcloud/templates/secrets.yaml b/charts/nextcloud/templates/secrets.yaml
index 4699c471..b5d25002 100644
--- a/charts/nextcloud/templates/secrets.yaml
+++ b/charts/nextcloud/templates/secrets.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nextcloud.labels"  ( dict "rootContext" $ ) | nindent 4 }}
 type: Opaque
diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
index 78ac3b99..993d2534 100644
--- a/charts/nextcloud/templates/service.yaml
+++ b/charts/nextcloud/templates/service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   {{- with .Values.service.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/nextcloud/templates/serviceaccount.yaml b/charts/nextcloud/templates/serviceaccount.yaml
index 84989dc0..c2d33144 100644
--- a/charts/nextcloud/templates/serviceaccount.yaml
+++ b/charts/nextcloud/templates/serviceaccount.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.rbac.serviceaccount.name }}
+  namespace: {{ .Release.Namespace }}
   {{- with .Values.rbac.serviceaccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}