diff --git a/charts/nextcloud/templates/nextcloud.yaml b/charts/nextcloud/templates/nextcloud.yaml
index 539925b..a6ae33e 100644
--- a/charts/nextcloud/templates/nextcloud.yaml
+++ b/charts/nextcloud/templates/nextcloud.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: nextcloud-pv
+  namespace: {{ .Release.Namespace }}
 spec:
   capacity:
     storage: 10Gi
@@ -17,7 +18,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: nextcloud-pvc
-  namespace: nextcloud
+  namespace: {{ .Release.Namespace }}
 spec:
   accessModes:
     - ReadWriteOnce
@@ -31,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: nextcloud
-  namespace: nextcloud
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - port: 80
@@ -42,7 +43,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nextcloud
-  namespace: nextcloud
+  namespace: {{ .Release.Namespace }}
 spec:
   securityContext:
     runAsUser:  1000
@@ -89,7 +90,7 @@ apiVersion: k8s.mariadb.com/v1alpha1
 kind: MariaDB
 metadata:
   name: nextcloud-db
-  namespace: nextcloud
+  namespace: {{ .Release.Namespace }}
 spec:
   rootPasswordSecretKeyRef:
     name: nextcloud-secrets
@@ -107,7 +108,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: wildcard-hxme-net
-  namespace: nextcloud
+  namespace: {{ .Release.Namespace }}
   annotations:
     replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net
 ---
@@ -115,7 +116,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: nextcloud
-  namespace: nextcloud
+  namespace: {{ .Release.Namespace }}
   annotations:
     external-dns.alpha.kubernetes.io/hostname: nc.hxme.net
 spec: