diff --git a/packages/extra/monitoring/Chart.yaml b/packages/extra/monitoring/Chart.yaml
index e7cf49d0..48579bcf 100644
--- a/packages/extra/monitoring/Chart.yaml
+++ b/packages/extra/monitoring/Chart.yaml
@@ -3,4 +3,4 @@ name: monitoring
 description: Monitoring and observability stack
 icon: /logos/monitoring.svg
 type: application
-version: 1.6.0
+version: 1.6.1
diff --git a/packages/extra/monitoring/templates/alerta/alerta-db.yaml b/packages/extra/monitoring/templates/alerta/alerta-db.yaml
index 91c4e4aa..397d554b 100644
--- a/packages/extra/monitoring/templates/alerta/alerta-db.yaml
+++ b/packages/extra/monitoring/templates/alerta/alerta-db.yaml
@@ -11,6 +11,9 @@ spec:
     storageClass: {{ . }}
     {{- end }}
 
+  monitoring:
+    enablePodMonitor: true
+
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
diff --git a/packages/extra/monitoring/templates/grafana/db.yaml b/packages/extra/monitoring/templates/grafana/db.yaml
index 9ec952c3..1e05a4f7 100644
--- a/packages/extra/monitoring/templates/grafana/db.yaml
+++ b/packages/extra/monitoring/templates/grafana/db.yaml
@@ -7,6 +7,9 @@ spec:
   storage:
     size: {{ .Values.grafana.db.size }}
 
+  monitoring:
+    enablePodMonitor: true
+
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
diff --git a/packages/extra/versions_map b/packages/extra/versions_map
index 675ebd20..a9e36614 100644
--- a/packages/extra/versions_map
+++ b/packages/extra/versions_map
@@ -21,7 +21,8 @@ monitoring 1.5.1 57e90b70
 monitoring 1.5.2 898374b5
 monitoring 1.5.3 c1ca19dc
 monitoring 1.5.4 d4634797
-monitoring 1.6.0 HEAD
+monitoring 1.6.0 cb7b8158
+monitoring 1.6.1 HEAD
 seaweedfs 0.1.0 5ca8823
 seaweedfs 0.2.0 9e33dc0
 seaweedfs 0.2.1 249bf35
diff --git a/packages/system/keycloak/templates/db.yaml b/packages/system/keycloak/templates/db.yaml
index 0ad0e34b..ad374bda 100644
--- a/packages/system/keycloak/templates/db.yaml
+++ b/packages/system/keycloak/templates/db.yaml
@@ -7,6 +7,9 @@ spec:
   storage:
     size: 20Gi
 
+  monitoring:
+    enablePodMonitor: true
+
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
diff --git a/packages/system/seaweedfs/templates/database.yaml b/packages/system/seaweedfs/templates/database.yaml
index 1b0bbf22..e952ff97 100644
--- a/packages/system/seaweedfs/templates/database.yaml
+++ b/packages/system/seaweedfs/templates/database.yaml
@@ -8,6 +8,9 @@ spec:
   storage:
     size: 10Gi
 
+  monitoring:
+    enablePodMonitor: true
+
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"