diff --git a/argocd/apps/cloudnative-pg.yaml b/argocd/apps/cloudnative-pg.yaml
new file mode 100644
index 00000000..a8611657
--- /dev/null
+++ b/argocd/apps/cloudnative-pg.yaml
@@ -0,0 +1,28 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cloudnative-pg
+spec:
+  destination:
+    namespace: cloudnative-pg
+    server: https://kubernetes.default.svc
+  project: everest
+  sources:
+    - repoURL: https://github.com/nidr0x/k8s-gitops
+      targetRevision: master
+      ref: nidr0x-k8s-gitops
+    - repoURL: https://github.com/nidr0x/k8s-gitops
+      targetRevision: master
+      path: kubernetes/main/apps/cloudnative-pg
+    - repoURL: https://cloudnative-pg.github.io/charts
+      targetRevision: 0.22.1
+      chart: cloudnative-pg
+      helm:
+        valueFiles:
+          - $nidr0x-k8s-gitops/kubernetes/main/apps/cloudnative-pg/values.yaml
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/kubernetes/main/apps/cloudnative-pg/values.yaml b/kubernetes/main/apps/cloudnative-pg/values.yaml
new file mode 100644
index 00000000..5127068d
--- /dev/null
+++ b/kubernetes/main/apps/cloudnative-pg/values.yaml
@@ -0,0 +1,3 @@
+cloudnative-pg:
+  monitoring:
+    podMonitorEnabled: true