diff --git a/deployments/networks/dashboard/grafana/beefy-dashboard.json b/deployments/networks/dashboard/grafana/beefy-dashboard.json
index c314c3de16..2fef8de437 100644
--- a/deployments/networks/dashboard/grafana/beefy-dashboard.json
+++ b/deployments/networks/dashboard/grafana/beefy-dashboard.json
@@ -43,6 +43,29 @@
               "type": "max"
             },
             "type": "query"
+          },
+          {
+            "evaluator": {
+              "params": [
+                1
+              ],
+              "type": "lt"
+            },
+            "operator": {
+              "type": "or"
+            },
+            "query": {
+              "params": [
+                "D",
+                "5m",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "max"
+            },
+            "type": "query"
           }
         ],
         "executionErrorState": "alerting",
@@ -113,23 +136,23 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "substrate_beefy_best_block{instance=\"rialto-node-charlie:9615\"}",
+          "expr": "substrate_beefy_best_block{chain=\"rialto_local\"}",
           "legendFormat": "Rialto(Charlie)",
           "refId": "A"
         },
         {
-          "expr": "substrate_beefy_best_block{instance=\"millau-node-charlie:9615\"}",
+          "expr": "substrate_beefy_best_block{chain=\"millau_local\"}",
           "legendFormat": "Millau(Charlie)",
           "refId": "B"
         },
         {
-          "expr": "max_over_time(substrate_beefy_best_block{instance=\"millau-node-charlie:9615\"}[5m]) - min_over_time(substrate_beefy_best_block{instance=\"millau-node-charlie:9615\"}[5m])",
+          "expr": "max_over_time(substrate_beefy_best_block{chain=\"millau_local\"}[5m]) - min_over_time(substrate_beefy_best_block{chain=\"millau_local\"}[5m])",
           "hide": true,
           "legendFormat": "Millau Best Beefy blocks count in last 5 minutes",
           "refId": "C"
         },
         {
-          "expr": "max_over_time(substrate_beefy_best_block{instance=\"rialto-node-charlie:9615\"}[5m]) - min_over_time(substrate_beefy_best_block{instance=\"rialto-node-charlie:9615\"}[5m])",
+          "expr": "max_over_time(substrate_beefy_best_block{chain=\"rialto_local\"}[5m]) - min_over_time(substrate_beefy_best_block{chain=\"rialto_local\"}[5m])",
           "hide": true,
           "legendFormat": "Rialto Best Beefy blocks count in last 5 minutes",
           "refId": "D"
@@ -230,22 +253,22 @@
       "pluginVersion": "7.1.3",
       "targets": [
         {
-          "expr": "substrate_beefy_should_vote_on{instance=\"rialto-node-charlie:9615\"}",
+          "expr": "substrate_beefy_should_vote_on{chain=\"rialto_local\"}",
           "legendFormat": "Rialto(Charlie) Should-Vote-On",
           "refId": "C"
         },
         {
-          "expr": "substrate_beefy_round_concluded{instance=\"rialto-node-charlie:9615\"}",
+          "expr": "substrate_beefy_round_concluded{chain=\"rialto_local\"}",
           "legendFormat": "Rialto(Charlie) Round-Concluded",
           "refId": "A"
         },
         {
-          "expr": "substrate_beefy_should_vote_on{instance=\"millau-node-charlie:9615\"}",
+          "expr": "substrate_beefy_should_vote_on{chain=\"millau_local\"}",
           "legendFormat": "Millau(Charlie) Should-Vote-On",
           "refId": "D"
         },
         {
-          "expr": "substrate_beefy_round_concluded{instance=\"millau-node-charlie:9615\"}",
+          "expr": "substrate_beefy_round_concluded{chain=\"millau_local\"}",
           "legendFormat": "Millau(Charlie) Round-Concluded",
           "refId": "B"
         }
@@ -300,12 +323,12 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "substrate_beefy_votes_sent{instance=\"rialto-node-charlie:9615\"}",
+          "expr": "substrate_beefy_votes_sent{chain=\"rialto_local\"}",
           "legendFormat": "Rialto (node Charlie)",
           "refId": "A"
         },
         {
-          "expr": "substrate_beefy_votes_sent{instance=\"millau-node-charlie:9615\"}",
+          "expr": "substrate_beefy_votes_sent{chain=\"millau_local\"}",
           "legendFormat": "Millau (node Charlie)",
           "refId": "B"
         }
@@ -355,6 +378,29 @@
       "alert": {
         "alertRuleTags": {},
         "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                0
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "A",
+                "5m",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "max"
+            },
+            "type": "query"
+          },
           {
             "evaluator": {
               "params": [
@@ -447,12 +493,12 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "substrate_beefy_skipped_sessions{instance=\"rialto-node-charlie:9615\"}",
+          "expr": "substrate_beefy_skipped_sessions{chain=\"rialto_local\"}",
           "legendFormat": "Rialto(Charlie)",
           "refId": "A"
         },
         {
-          "expr": "substrate_beefy_skipped_sessions{instance=\"millau-node-charlie:9615\"}",
+          "expr": "substrate_beefy_skipped_sessions{chain=\"millau_local\"}",
           "legendFormat": "Millau(Charlie)",
           "refId": "B"
         }