diff --git a/dashboards/service/cloudnative-pg.json b/dashboards/service/cloudnative-pg.json
index 7c99636..2979b08 100644
--- a/dashboards/service/cloudnative-pg.json
+++ b/dashboards/service/cloudnative-pg.json
@@ -37,7 +37,7 @@
       },
       "id": 676,
       "options": {
-        "alertInstanceLabelFilter": "{namespace=~\"$namespace\"}",
+        "alertInstanceLabelFilter": "{namespace=~\"$namespace\",pod=~\"$instances\"}",
         "alertName": "",
         "dashboardAlerts": false,
         "folder": "",
@@ -3578,7 +3578,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 18
+        "y": 21
       },
       "id": 41,
       "panels": [
@@ -3591,7 +3591,7 @@
             "h": 1,
             "w": 3,
             "x": 0,
-            "y": 19
+            "y": 22
           },
           "id": 187,
           "options": {
@@ -3617,7 +3617,7 @@
             "h": 1,
             "w": 3,
             "x": 3,
-            "y": 19
+            "y": 22
           },
           "id": 183,
           "options": {
@@ -3642,7 +3642,7 @@
             "h": 1,
             "w": 3,
             "x": 6,
-            "y": 19
+            "y": 22
           },
           "id": 184,
           "options": {
@@ -3667,7 +3667,7 @@
             "h": 1,
             "w": 3,
             "x": 9,
-            "y": 19
+            "y": 22
           },
           "id": 185,
           "options": {
@@ -3692,7 +3692,7 @@
             "h": 1,
             "w": 3,
             "x": 12,
-            "y": 19
+            "y": 22
           },
           "id": 186,
           "options": {
@@ -3717,7 +3717,7 @@
             "h": 1,
             "w": 3,
             "x": 15,
-            "y": 19
+            "y": 22
           },
           "id": 188,
           "options": {
@@ -3742,7 +3742,7 @@
             "h": 1,
             "w": 3,
             "x": 18,
-            "y": 19
+            "y": 22
           },
           "id": 189,
           "options": {
@@ -3767,7 +3767,7 @@
             "h": 1,
             "w": 3,
             "x": 21,
-            "y": 19
+            "y": 22
           },
           "id": 190,
           "options": {
@@ -3792,7 +3792,7 @@
             "h": 3,
             "w": 3,
             "x": 0,
-            "y": 20
+            "y": 23
           },
           "id": 86,
           "options": {
@@ -3837,7 +3837,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 20
+            "y": 23
           },
           "id": 30,
           "options": {
@@ -3904,7 +3904,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 20
+            "y": 23
           },
           "id": 24,
           "options": {
@@ -3971,7 +3971,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 20
+            "y": 23
           },
           "id": 57,
           "options": {
@@ -4038,7 +4038,7 @@
             "h": 3,
             "w": 3,
             "x": 12,
-            "y": 20
+            "y": 23
           },
           "id": 26,
           "options": {
@@ -4104,7 +4104,7 @@
             "h": 3,
             "w": 3,
             "x": 15,
-            "y": 20
+            "y": 23
           },
           "id": 47,
           "options": {
@@ -4170,7 +4170,7 @@
             "h": 3,
             "w": 3,
             "x": 18,
-            "y": 20
+            "y": 23
           },
           "id": 48,
           "options": {
@@ -4236,7 +4236,7 @@
             "h": 3,
             "w": 3,
             "x": 21,
-            "y": 20
+            "y": 23
           },
           "id": 56,
           "options": {
@@ -4308,7 +4308,7 @@
             "h": 9,
             "w": 24,
             "x": 0,
-            "y": 29
+            "y": 35
           },
           "id": 150,
           "options": {
@@ -4403,7 +4403,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 19
+        "y": 22
       },
       "id": 10,
       "panels": [
@@ -4473,7 +4473,7 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 78
+            "y": 76
           },
           "id": 273,
           "options": {
@@ -4649,7 +4649,7 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 78
+            "y": 76
           },
           "id": 275,
           "options": {
@@ -4745,7 +4745,7 @@
             "h": 8,
             "w": 24,
             "x": 0,
-            "y": 85
+            "y": 83
           },
           "id": 39,
           "options": {
@@ -4853,7 +4853,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 93
+            "y": 91
           },
           "id": 50,
           "options": {
@@ -4965,7 +4965,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 93
+            "y": 91
           },
           "id": 4,
           "options": {
@@ -5016,6 +5016,7 @@
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
+                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 10,
                 "gradientMode": "none",
@@ -5053,8 +5054,7 @@
                     "value": 80
                   }
                 ]
-              },
-              "unitScale": true
+              }
             },
             "overrides": []
           },
@@ -5062,7 +5062,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 101
+            "y": 99
           },
           "id": 55,
           "options": {
@@ -5073,10 +5073,12 @@
               "showLegend": true
             },
             "tooltip": {
+              "hideZeros": false,
               "mode": "multi",
               "sort": "none"
             }
           },
+          "pluginVersion": "12.0.0",
           "targets": [
             {
               "datasource": {
@@ -5113,6 +5115,7 @@
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
+                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 10,
                 "gradientMode": "none",
@@ -5150,8 +5153,7 @@
                     "value": 80
                   }
                 ]
-              },
-              "unitScale": true
+              }
             },
             "overrides": []
           },
@@ -5159,7 +5161,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 101
+            "y": 99
           },
           "id": 54,
           "options": {
@@ -5170,10 +5172,12 @@
               "showLegend": true
             },
             "tooltip": {
+              "hideZeros": false,
               "mode": "multi",
               "sort": "none"
             }
           },
+          "pluginVersion": "12.0.0",
           "targets": [
             {
               "datasource": {
@@ -5200,7 +5204,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 20
+        "y": 23
       },
       "id": 35,
       "panels": [
@@ -5242,7 +5246,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 181
+            "y": 152
           },
           "id": 424,
           "options": {
@@ -5330,7 +5334,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 181
+            "y": 152
           },
           "id": 426,
           "options": {
@@ -5416,7 +5420,7 @@
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 189
+            "y": 160
           },
           "id": 564,
           "options": {
@@ -5515,7 +5519,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 196
+            "y": 167
           },
           "id": 44,
           "options": {
@@ -5667,7 +5671,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 196
+            "y": 167
           },
           "id": 46,
           "options": {
@@ -5774,7 +5778,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 204
+            "y": 175
           },
           "id": 22,
           "options": {
@@ -5872,7 +5876,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 204
+            "y": 175
           },
           "id": 2,
           "options": {
@@ -5914,7 +5918,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 21
+        "y": 24
       },
       "id": 37,
       "panels": [
@@ -5981,7 +5985,7 @@
             "h": 8,
             "w": 8,
             "x": 0,
-            "y": 182
+            "y": 153
           },
           "id": 6,
           "options": {
@@ -6087,7 +6091,7 @@
             "h": 8,
             "w": 8,
             "x": 8,
-            "y": 182
+            "y": 153
           },
           "id": 52,
           "options": {
@@ -6195,7 +6199,7 @@
             "h": 8,
             "w": 8,
             "x": 16,
-            "y": 182
+            "y": 153
           },
           "id": 53,
           "options": {
@@ -6289,7 +6293,7 @@
             "h": 8,
             "w": 8,
             "x": 0,
-            "y": 190
+            "y": 161
           },
           "id": 725,
           "options": {
@@ -6331,7 +6335,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 22
+        "y": 25
       },
       "id": 18,
       "panels": [
@@ -6403,7 +6407,7 @@
             "h": 8,
             "w": 6,
             "x": 0,
-            "y": 188
+            "y": 159
           },
           "id": 16,
           "options": {
@@ -6499,7 +6503,7 @@
             "h": 8,
             "w": 6,
             "x": 6,
-            "y": 188
+            "y": 159
           },
           "id": 14,
           "options": {
@@ -6596,7 +6600,7 @@
             "h": 8,
             "w": 6,
             "x": 12,
-            "y": 188
+            "y": 159
           },
           "id": 59,
           "options": {
@@ -6694,7 +6698,7 @@
             "h": 8,
             "w": 6,
             "x": 18,
-            "y": 188
+            "y": 159
           },
           "id": 20,
           "options": {
@@ -6737,7 +6741,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 23
+        "y": 26
       },
       "id": 231,
       "panels": [
@@ -6766,7 +6770,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 184
+            "y": 155
           },
           "id": 233,
           "options": {
@@ -6887,7 +6891,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 184
+            "y": 155
           },
           "id": 235,
           "options": {
@@ -6928,7 +6932,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 24
+        "y": 27
       },
       "id": 239,
       "panels": [
@@ -6996,7 +7000,7 @@
             "h": 6,
             "w": 8,
             "x": 0,
-            "y": 185
+            "y": 156
           },
           "id": 237,
           "options": {
@@ -7038,7 +7042,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 25
+        "y": 28
       },
       "id": 293,
       "panels": [
@@ -7107,7 +7111,7 @@
             "h": 6,
             "w": 5,
             "x": 0,
-            "y": 186
+            "y": 157
           },
           "id": 295,
           "options": {
@@ -7221,7 +7225,7 @@
             "h": 6,
             "w": 5,
             "x": 5,
-            "y": 186
+            "y": 157
           },
           "id": 296,
           "options": {
@@ -7280,7 +7284,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 26
+        "y": 29
       },
       "id": 794,
       "panels": [
@@ -7303,19 +7307,6 @@
                 },
                 "filterable": false,
                 "inspect": false
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
               }
             },
             "overrides": [
@@ -7363,7 +7354,7 @@
             "h": 8,
             "w": 24,
             "x": 0,
-            "y": 148
+            "y": 181
           },
           "id": 792,
           "options": {
@@ -7382,7 +7373,7 @@
               }
             ]
           },
-          "pluginVersion": "12.0.0",
+          "pluginVersion": "11.4.0",
           "targets": [
             {
               "disableTextWrap": false,
@@ -7449,7 +7440,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 27
+        "y": 30
       },
       "id": 696,
       "panels": [
@@ -7505,7 +7496,7 @@
             "h": 2,
             "w": 4,
             "x": 0,
-            "y": 193
+            "y": 164
           },
           "id": 697,
           "options": {
@@ -7605,7 +7596,7 @@
             "h": 2,
             "w": 4,
             "x": 4,
-            "y": 193
+            "y": 164
           },
           "id": 702,
           "options": {
@@ -7705,7 +7696,7 @@
             "h": 2,
             "w": 4,
             "x": 8,
-            "y": 193
+            "y": 164
           },
           "id": 698,
           "options": {
@@ -7805,7 +7796,7 @@
             "h": 2,
             "w": 4,
             "x": 12,
-            "y": 193
+            "y": 164
           },
           "id": 704,
           "options": {
@@ -7905,7 +7896,7 @@
             "h": 2,
             "w": 4,
             "x": 16,
-            "y": 193
+            "y": 164
           },
           "id": 703,
           "options": {
@@ -8026,7 +8017,7 @@
             "h": 8,
             "w": 4,
             "x": 0,
-            "y": 195
+            "y": 166
           },
           "id": 746,
           "options": {
@@ -8155,7 +8146,7 @@
             "h": 8,
             "w": 4,
             "x": 4,
-            "y": 195
+            "y": 166
           },
           "id": 767,
           "options": {
@@ -8283,7 +8274,7 @@
             "h": 8,
             "w": 4,
             "x": 8,
-            "y": 195
+            "y": 166
           },
           "id": 768,
           "options": {
@@ -8411,7 +8402,7 @@
             "h": 8,
             "w": 4,
             "x": 12,
-            "y": 195
+            "y": 166
           },
           "id": 790,
           "options": {
@@ -8541,7 +8532,7 @@
             "h": 8,
             "w": 4,
             "x": 16,
-            "y": 195
+            "y": 166
           },
           "id": 769,
           "options": {
@@ -8580,7 +8571,7 @@
     }
   ],
   "preload": true,
-  "tags": ["service", "storage", "database"],
+  "tags": ["service", "cloudnativepg", "storage"],
   "templating": {
     "list": [
       {
@@ -8671,7 +8662,7 @@
       {
         "allValue": "$cluster-([1-9][0-9]*)",
         "current": {
-          "text": "All",
+          "text": ["All"],
           "value": ["$__all"]
         },
         "datasource": {
@@ -8704,5 +8695,5 @@
   "timezone": "browser",
   "title": "CloudNativePG",
   "uid": "b61d66332d3e7f68f2270aa012e6a9a9",
-  "version": 10
+  "version": 11
 }