diff --git a/clusters/titan.lan.huizinga.dev/infra/cnpg.yaml b/clusters/titan.lan.huizinga.dev/infra/cnpg.yaml
new file mode 100644
index 0000000..3a74758
--- /dev/null
+++ b/clusters/titan.lan.huizinga.dev/infra/cnpg.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cnpg
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./infra/cnpg
+  dependsOn:
+    - name: topolvm
+  prune: true
+  timeout: 2m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: true
diff --git a/infrastructure/controllers/cloudnative-pg.yaml b/infra/cnpg/helm-release.yaml
similarity index 57%
rename from infrastructure/controllers/cloudnative-pg.yaml
rename to infra/cnpg/helm-release.yaml
index 119a2ba..4af04fa 100644
--- a/infrastructure/controllers/cloudnative-pg.yaml
+++ b/infra/cnpg/helm-release.yaml
@@ -1,17 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cnpg-system
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: cnpg
-  namespace: cnpg-system
-spec:
-  interval: 1m0s
-  url: https://cloudnative-pg.github.io/charts
----
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
diff --git a/infra/cnpg/helm-repository.yaml b/infra/cnpg/helm-repository.yaml
new file mode 100644
index 0000000..7b3732d
--- /dev/null
+++ b/infra/cnpg/helm-repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: cnpg
+  namespace: cnpg-system
+spec:
+  interval: 1m0s
+  url: https://cloudnative-pg.github.io/charts
diff --git a/infra/cnpg/kustomization.yaml b/infra/cnpg/kustomization.yaml
new file mode 100644
index 0000000..4c991cb
--- /dev/null
+++ b/infra/cnpg/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./namespace.yaml
+  - ./helm-repository.yaml
+  - ./helm-release.yaml
diff --git a/infra/cnpg/namespace.yaml b/infra/cnpg/namespace.yaml
new file mode 100644
index 0000000..8deac4c
--- /dev/null
+++ b/infra/cnpg/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cnpg-system
diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml
index 15d9b6c..998bf45 100644
--- a/infrastructure/controllers/kustomization.yaml
+++ b/infrastructure/controllers/kustomization.yaml
@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - akri.yaml
-  - cloudnative-pg.yaml
   - ./node-feature-discovery
   - https://raw.githubusercontent.com/dragonflydb/dragonfly-operator/refs/tags/v1.1.8/manifests/dragonfly-operator.yaml
   - https://github.com/kubernetes-csi/external-snapshotter//client/config/crd?ref=v8.2.0