diff --git a/apps/base/cnpg-system/kustomization.yaml b/apps/base/cnpg-system/kustomization.yaml
new file mode 100644
index 0000000..5122f9e
--- /dev/null
+++ b/apps/base/cnpg-system/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - namespace.yaml
diff --git a/apps/base/cnpg-system/namespace.yaml b/apps/base/cnpg-system/namespace.yaml
new file mode 100644
index 0000000..1f89c52
--- /dev/null
+++ b/apps/base/cnpg-system/namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cnpg-system
diff --git a/apps/overlays/au-syd1/cnpg-system/kustomization.yaml b/apps/overlays/au-syd1/cnpg-system/kustomization.yaml
new file mode 100644
index 0000000..e58fe7c
--- /dev/null
+++ b/apps/overlays/au-syd1/cnpg-system/kustomization.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../base/cnpg-system
+
+helmCharts:
+  - name: cloudnative-pg
+    repo: https://cloudnative-pg.github.io/charts
+    version: "0.27.0"
+    releaseName: cloudnative-pg-operator
+    namespace: cnpg-system
+    valuesFile: values.yaml
diff --git a/apps/overlays/au-syd1/cnpg-system/values.yaml b/apps/overlays/au-syd1/cnpg-system/values.yaml
new file mode 100644
index 0000000..f2c5fe4
--- /dev/null
+++ b/apps/overlays/au-syd1/cnpg-system/values.yaml
@@ -0,0 +1,16 @@
+replicaCount: 2
+
+resources:
+  limits:
+    cpu: 500m
+    memory: 400Mi
+  requests:
+    cpu: 10m
+    memory: 200Mi
+
+podDisruptionBudget:
+  enabled: true
+  minAvailable: 1
+
+monitoring:
+  createPodMonitor: false # Requires Prometheus Operator CRDs.
diff --git a/argocd/applicationsets/platform.yaml b/argocd/applicationsets/platform.yaml
index 6e7115c..18a0d37 100644
--- a/argocd/applicationsets/platform.yaml
+++ b/argocd/applicationsets/platform.yaml
@@ -11,6 +11,7 @@ spec:
       revision: HEAD
       directories:
       - path: apps/overlays/*/artifactapi
+      - path: apps/overlays/*/cnpg-system
       - path: apps/overlays/*/reflector-system
       - path: apps/overlays/*/reloader-system
       - path: apps/overlays/*/jfrog
diff --git a/argocd/projects/platform.yaml b/argocd/projects/platform.yaml
index d7941c5..f011fbc 100644
--- a/argocd/projects/platform.yaml
+++ b/argocd/projects/platform.yaml
@@ -10,6 +10,7 @@ spec:
     - https://git.unkin.net/unkin/argocd-apps
     - oci://ghcr.io/emberstack/helm-charts
     - oci://ghcr.io/woodpecker-ci/helm/woodpecker
+    - https://cloudnative-pg.github.io/charts
   destinations:
     - namespace: '*-system'
       server: https://kubernetes.default.svc