diff --git a/grafana/provisioning/dashboards/zertoencryption.json b/grafana/provisioning/dashboards/zertoencryption.json
index 54f3882..bdb17d5 100644
--- a/grafana/provisioning/dashboards/zertoencryption.json
+++ b/grafana/provisioning/dashboards/zertoencryption.json
@@ -214,7 +214,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "builder",
-          "expr": "sum(vm_UnencryptedDataInLBs)",
+          "expr": "sum(vm_UnencryptedDataInLBs{SiteName=\"$SiteName\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "Unencrypted Logical Blocks",
@@ -227,7 +227,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "builder",
-          "expr": "sum(vm_EncryptedDataInLBs)",
+          "expr": "sum(vm_EncryptedDataInLBs{SiteName=\"$SiteName\"})",
           "hide": false,
           "legendFormat": "Encrypted Logical Blocks",
           "range": true,
@@ -653,6 +653,6 @@
   "timezone": "",
   "title": "Encryption Analyzer Dashboard",
   "uid": "DqUCTVcVz",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }