diff --git a/infrastructure/hydra/cloud-native-pg/cluster-namespace.yaml b/infrastructure/hydra/cloud-native-pg/cluster-namespace.yaml
new file mode 100644
index 0000000..b332812
--- /dev/null
+++ b/infrastructure/hydra/cloud-native-pg/cluster-namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cnpg-cluster
+spec: {}
+status: {}
diff --git a/infrastructure/hydra/truenas-csi/kuztomization.yaml b/infrastructure/hydra/truenas-csi/kuztomization.yaml
index 3d6f007..9ee4573 100644
--- a/infrastructure/hydra/truenas-csi/kuztomization.yaml
+++ b/infrastructure/hydra/truenas-csi/kuztomization.yaml
@@ -4,16 +4,16 @@ metadata:
   name: truenas-csi
   namespace: truenas-csi
 resources:
-- iscsi-storage-class.yaml
-- controller-service-account.yaml
+- controller-cluster-role.yaml
 - controller-binding.yaml
-- node-service-account.yaml
 - node-cluster-role.yaml
+- CSIDriver.yaml
+- nfs-storage-class.yaml
+- node-service-account.yaml
 - node-binding.yaml
 - node-deamonset.yaml
+- config.yaml
+- iscsi-storage-class.yaml
 - namespace.yaml
 - controller-deployment.yaml
-- controller-cluster-role.yaml
-- CSIDriver.yaml
-- config.yaml
-- nfs-storage-class.yaml
+- controller-service-account.yaml
diff --git a/pkg/cnpg/cnpg.go b/pkg/cnpg/cnpg.go
index 55bfeb4..79f4810 100644
--- a/pkg/cnpg/cnpg.go
+++ b/pkg/cnpg/cnpg.go
@@ -12,6 +12,7 @@ import (
 
 var meta kube.Metadata
 var Namespace = kube.Namespace(root.CloudNativePG + "-system")
+var PGClusterNamespace = kube.Namespace(root.CloudNativePG + "-cluster")
 
 func init() {
 	meta = kube.NewMetadata(root.CloudNativePG, Namespace)
@@ -20,6 +21,7 @@ func init() {
 func Stack() stack.Stack {
 	s := stack.NewStack("cloud-native-pg", map[string]any{
 		"namespace":              Namespace,
+		"cluster-namespace":      PGClusterNamespace,
 		"helm-repository-source": HelmSource(),
 		"helm-release":           HelmRelease(),
 		"pg-cluster":             Cluster(),
@@ -28,8 +30,7 @@ func Stack() stack.Stack {
 }
 
 func Cluster() pg.Cluster {
-	namespace := kube.Namespace(root.CloudNativePG + "-cluster")
-	meta = kube.NewMetadata(root.CloudNativePG+"-cluster", namespace)
+	meta := kube.NewMetadata(root.CloudNativePG+"-cluster", PGClusterNamespace)
 	spec := pg.ClusterSpec{
 		Instances: 3,
 		StorageConfiguration: pg.StorageConfiguration{