diff --git a/k8s/apps/storage/cloudnative-pg/app/helm-release.yaml b/k8s/apps/storage/cloudnative-pg/app/helm-release.yaml
index 7ea0f103..60378d82 100644
--- a/k8s/apps/storage/cloudnative-pg/app/helm-release.yaml
+++ b/k8s/apps/storage/cloudnative-pg/app/helm-release.yaml
@@ -2,7 +2,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
     name: postgres
-    namespace: storage
 spec:
     interval: 15m
     chart:
diff --git a/k8s/apps/storage/cloudnative-pg/cluster/cluster.yaml b/k8s/apps/storage/cloudnative-pg/cluster/cluster.yaml
index 6ddec6a3..c2cdfd51 100644
--- a/k8s/apps/storage/cloudnative-pg/cluster/cluster.yaml
+++ b/k8s/apps/storage/cloudnative-pg/cluster/cluster.yaml
@@ -2,7 +2,6 @@ apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
   name: pg-cluster
-  namespace: storage
 spec:
   instances: 3
   primaryUpdateStrategy: unsupervised
diff --git a/k8s/apps/storage/cloudnative-pg/cluster/scheduledbackup.yaml b/k8s/apps/storage/cloudnative-pg/cluster/scheduledbackup.yaml
index 644bc060..38c44bc8 100644
--- a/k8s/apps/storage/cloudnative-pg/cluster/scheduledbackup.yaml
+++ b/k8s/apps/storage/cloudnative-pg/cluster/scheduledbackup.yaml
@@ -2,7 +2,6 @@ apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
   name: postgres
-  namespace: storage
 spec:
   schedule: "@weekly"
   immediate: true
diff --git a/k8s/apps/storage/cloudnative-pg/ks.yaml b/k8s/apps/storage/cloudnative-pg/ks.yaml
index 67c61840..5accc2c3 100644
--- a/k8s/apps/storage/cloudnative-pg/ks.yaml
+++ b/k8s/apps/storage/cloudnative-pg/ks.yaml
@@ -6,6 +6,7 @@ metadata:
   name: cloudnative-pg
   namespace: flux-system
 spec:
+  targetNamespace: storage
   path: ./k8s/apps/storage/cloudnative-pg/app
   prune: true
   sourceRef:
@@ -23,6 +24,7 @@ metadata:
   name: cloudnative-pg-cluster
   namespace: flux-system
 spec:
+  targetNamespace: storage
   path: ./k8s/apps/storage/cloudnative-pg/cluster
   dependsOn:
     - name: cloudnative-pg