diff --git a/dashboards/service/cloudnative-pg.json b/dashboards/service/cloudnative-pg.json
index 703a61f..0e3b3a6 100644
--- a/dashboards/service/cloudnative-pg.json
+++ b/dashboards/service/cloudnative-pg.json
@@ -24,7 +24,7 @@
   "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
-  "id": 339,
+  "id": 378,
   "links": [],
   "panels": [
     {
@@ -1199,7 +1199,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "-(time() - max(cnpg_collector_last_available_backup_timestamp{namespace=\"$namespace\",pod=~\"$instances\"}))",
+          "expr": "-(time() - max({__name__=~\"cnpg_collector_last_available_backup_timestamp|barman_cloud_cloudnative_pg_io_last_available_backup_timestamp\",namespace=\"$namespace\",pod=~\"$instances\"}))",
           "instant": true,
           "legendFormat": "__auto",
           "range": false,
@@ -1841,7 +1841,7 @@
             "uid": "kube-prometheus-stack"
           },
           "editorMode": "code",
-          "expr": "time() - max(cnpg_collector_last_available_backup_timestamp{namespace=\"$namespace\", pod=~\"$instances\"})",
+          "expr": "time() - max({__name__=~\"cnpg_collector_last_available_backup_timestamp|barman_cloud_cloudnative_pg_io_last_available_backup_timestamp\",namespace=\"$namespace\", pod=~\"$instances\"})",
           "legendFormat": "Backups",
           "range": true,
           "refId": "BACKUPS"
@@ -2637,7 +2637,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max(cnpg_collector_first_recoverability_point{namespace=~\"$namespace\",pod=~\"$instances\"})*1000",
+          "expr": "max({__name__=~\"cnpg_collector_first_recoverability_point|barman_cloud_cloudnative_pg_io_first_recoverability_point\",namespace=~\"$namespace\",pod=~\"$instances\"})*1000",
           "format": "time_series",
           "instant": true,
           "interval": "",
@@ -7118,7 +7118,7 @@
                 "uid": "kube-prometheus-stack"
               },
               "exemplar": true,
-              "expr": "cnpg_collector_first_recoverability_point{namespace=~\"$namespace\",pod=~\"$instances\"}*1000 > 0",
+              "expr": "{__name__=~\"cnpg_collector_first_recoverability_point|barman_cloud_cloudnative_pg_io_first_recoverability_point\",namespace=~\"$namespace\",pod=~\"$instances\"}*1000 > 0",
               "format": "time_series",
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -8750,8 +8750,8 @@
       },
       {
         "current": {
-          "text": "argo-workflows-postgresql-17-cluster",
-          "value": "argo-workflows-postgresql-17-cluster"
+          "text": "argo-workflows-postgresql-18-cluster",
+          "value": "argo-workflows-postgresql-18-cluster"
         },
         "datasource": {
           "type": "prometheus",
@@ -8775,7 +8775,9 @@
       {
         "allValue": "$cluster-([1-9][0-9]*)",
         "current": {
-          "text": "All",
+          "text": [
+            "All"
+          ],
           "value": [
             "$__all"
           ]
@@ -8813,5 +8815,5 @@
   "timezone": "",
   "title": "CloudNativePG",
   "uid": "cloudnative-pg",
-  "version": 2
-}
\ No newline at end of file
+  "version": 1
+}