diff --git a/infrastructure/hydra/cloud-native-pg/kustomization.yaml b/infrastructure/hydra/cloud-native-pg/kustomization.yaml
new file mode 100644
index 0000000..8ad6c57
--- /dev/null
+++ b/infrastructure/hydra/cloud-native-pg/kustomization.yaml
@@ -0,0 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+metadata:
+  name: cnpg
+  namespace: cnpg-system
+resources:
+- namespace.yaml
+- cluster-namespace.yaml
+- helm-repository-source.yaml
+- helm-release.yaml
+- pg-cluster.yaml
+- immich-db.yaml
diff --git a/infrastructure/hydra/kustomization.yaml b/infrastructure/hydra/kustomization.yaml
index e528fcd..e18e437 100644
--- a/infrastructure/hydra/kustomization.yaml
+++ b/infrastructure/hydra/kustomization.yaml
@@ -6,3 +6,4 @@ resources:
   - truenas-csi-driver.yaml
   - monitoring/
   - longhorn/
+  - cloud-native-pg/
diff --git a/infrastructure/hydra/truenas-csi/kustomization.yaml b/infrastructure/hydra/truenas-csi/kustomization.yaml
index c976dc5..96ca872 100644
--- a/infrastructure/hydra/truenas-csi/kustomization.yaml
+++ b/infrastructure/hydra/truenas-csi/kustomization.yaml
@@ -4,7 +4,7 @@ metadata:
   name: truenas-csi
   namespace: truenas-csi
 resources:
+- config.yaml
 - nfs-storage-class.yaml
 - iscsi-storage-class.yaml
 - namespace.yaml
-- config.yaml
diff --git a/pkg/cnpg/cnpg.go b/pkg/cnpg/cnpg.go
index 4530f76..bc2cfc4 100644
--- a/pkg/cnpg/cnpg.go
+++ b/pkg/cnpg/cnpg.go
@@ -14,13 +14,16 @@ func init() {
 }
 
 func Stack() stack.Stack {
-	s := stack.NewStack("cloud-native-pg", map[string]any{
-		"namespace":              SystemNamespace,
-		"cluster-namespace":      root.PGClusterNamespace,
-		"helm-repository-source": HelmSource(),
-		"helm-release":           HelmRelease(),
-		"pg-cluster":             Cluster(),
-		"immich-db":              ImmichDatabase(),
-	})
-	return s
+	kz := kube.NewKuztomizedStack(
+		meta_system,
+		map[string]any{
+			"namespace":              SystemNamespace,
+			"cluster-namespace":      root.PGClusterNamespace,
+			"helm-repository-source": HelmSource(),
+			"helm-release":           HelmRelease(),
+			"pg-cluster":             Cluster(),
+			"immich-db":              ImmichDatabase(),
+		},
+	)
+	return kz.Stack("cloud-native-pg")
 }