diff --git a/monitoring/grafana/moko-waas-dashboard.json b/monitoring/grafana/moko-waas-dashboard.json
index 8aa703e..b52835d 100644
--- a/monitoring/grafana/moko-waas-dashboard.json
+++ b/monitoring/grafana/moko-waas-dashboard.json
@@ -556,9 +556,10 @@
   ],
   "refresh": "5m",
   "tags": [
-    "waas",
+    "mokowaas",
     "joomla",
-    "panopticon"
+    "endpoints",
+    "monitoring"
   ],
   "templating": {
     "list": [
@@ -575,7 +576,7 @@
         "label": "Site",
         "multi": true,
         "name": "site",
-        "query": "label_values(probe_success{job=\"blackbox-http\", site_type=~\"joomla.*\"}, site_name)",
+        "query": "label_values(probe_success{job=\"blackbox-http\", site_type=~\"mokowaas.*\"}, site_name)",
         "refresh": 2,
         "sort": 1,
         "type": "query"