diff --git a/mon-system/monitoring.yaml b/mon-system/monitoring.yaml
index f05509d..6fa36bf 100644
--- a/mon-system/monitoring.yaml
+++ b/mon-system/monitoring.yaml
@@ -236,6 +236,33 @@ data:
             target_label: outpost
             regex: 'ak-outpost-(.*)-outpost'
             replacement: '$1'
+
+      # CloudNativePG - Postgres metrics per instance
+      - job_name: 'cloudnativepg'
+        kubernetes_sd_configs:
+          - role: pod
+            namespaces:
+              names: ['database-system']
+        relabel_configs:
+          # Keep only CNPG instance pods
+          - source_labels: [__meta_kubernetes_pod_label_cnpg_io_cluster]
+            action: keep
+            regex: '.+'
+          # Keep only the metrics port (9187)
+          - source_labels: [__meta_kubernetes_pod_container_port_number]
+            action: keep
+            regex: '9187'
+          - action: labelmap
+            regex: __meta_kubernetes_pod_label_(.+)
+          - source_labels: [__meta_kubernetes_namespace]
+            action: replace
+            target_label: namespace
+          - source_labels: [__meta_kubernetes_pod_name]
+            action: replace
+            target_label: pod
+          - source_labels: [__meta_kubernetes_pod_label_cnpg_io_cluster]
+            action: replace
+            target_label: cluster
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim