diff --git a/k8s/monitoring/templates/session-telemetry-dashboard.yaml b/k8s/monitoring/templates/session-telemetry-dashboard.yaml
index 84c48d2..2489816 100644
--- a/k8s/monitoring/templates/session-telemetry-dashboard.yaml
+++ b/k8s/monitoring/templates/session-telemetry-dashboard.yaml
@@ -103,7 +103,7 @@ data:
           "pluginVersion": "8.0.0",
           "targets": [
             {
-              "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" [$__range]))",
+              "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" [$__range]))",
               "refId": "A"
             }
           ],
@@ -149,7 +149,7 @@ data:
           "pluginVersion": "8.0.0",
           "targets": [
             {
-              "expr": "count(sum by (room) (count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt [$__range])))",
+              "expr": "count(sum by (room) (count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" | logfmt [$__range])))",
               "refId": "A"
             }
           ],
@@ -219,7 +219,7 @@ data:
           },
           "targets": [
             {
-              "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" [$__interval]))",
+              "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" [$__interval]))",
               "legendFormat": "Joins",
               "refId": "A"
             }
@@ -359,7 +359,7 @@ data:
           },
           "targets": [
             {
-              "expr": "sum(increase(session_summary_telemetry_total{type=\"join\", classifier=~\"$classifier\"}[$__range])) by (how_many_seen)",
+              "expr": "sum(increase(session_summary_telemetry_total{type=\"join\", classifier=~\"${classifier:regex}\"}[$__range])) by (how_many_seen)",
               "legendFormat": "{{ "{{" }}how_many_seen{{ "}}" }}",
               "refId": "A"
             }
@@ -394,7 +394,7 @@ data:
           },
           "targets": [
             {
-              "expr": "sum(increase(session_summary_telemetry_total{type=\"leave\", classifier=~\"$classifier\"}[$__range])) by (how_many_seen)",
+              "expr": "sum(increase(session_summary_telemetry_total{type=\"leave\", classifier=~\"${classifier:regex}\"}[$__range])) by (how_many_seen)",
               "legendFormat": "{{ "{{" }}how_many_seen{{ "}}" }}",
               "refId": "A"
             }
@@ -428,7 +428,7 @@ data:
           },
           "targets": [
             {
-              "expr": "sum(increase(session_join_telemetry_others_bucket{classifier=~\"$classifier\"}[$__range])) by (le)",
+              "expr": "sum(increase(session_join_telemetry_others_bucket{classifier=~\"${classifier:regex}\"}[$__range])) by (le)",
               "format": "heatmap",
               "refId": "A"
             }
@@ -462,7 +462,7 @@ data:
           },
           "targets": [
             {
-              "expr": "sum(increase(session_join_telemetry_age_bucket{classifier=~\"$classifier\"}[$__range])) by (le)",
+              "expr": "sum(increase(session_join_telemetry_age_bucket{classifier=~\"${classifier:regex}\"}[$__range])) by (le)",
               "format": "heatmap",
               "refId": "A"
             }
@@ -501,7 +501,7 @@ data:
           },
           "targets": [
             {
-              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt",
+              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" | logfmt",
               "maxLines": 500,
               "refId": "A"
             }
@@ -605,7 +605,7 @@ data:
           },
           "targets": [
             {
-              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt",
+              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" | logfmt",
               "maxLines": 500,
               "refId": "A"
             }
@@ -685,7 +685,7 @@ data:
           },
           "targets": [
             {
-              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_summary_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt",
+              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_summary_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" | logfmt",
               "maxLines": 500,
               "refId": "A"
             }
@@ -764,7 +764,7 @@ data:
           },
           "targets": [
             {
-              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=leave_summary_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt",
+              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=leave_summary_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" | logfmt",
               "maxLines": 500,
               "refId": "A"
             }
@@ -843,7 +843,7 @@ data:
           },
           "targets": [
             {
-              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" |= \"protocol=unknown\" | logfmt",
+              "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |~ \"classifier=\\\"(${classifier:regex})\\\"\" |= \"protocol=unknown\" | logfmt",
               "maxLines": 500,
               "refId": "A"
             }
@@ -951,7 +951,7 @@ data:
             },
             "hide": 0,
             "includeAll": true,
-            "label": "Traffic Type",
+            "label": "Classifier",
             "multi": true,
             "name": "classifier",
             "options": [
@@ -976,7 +976,7 @@ data:
                 "value": "Probe"
               }
             ],
-            "query": "Real, Test, Probe",
+            "query": "Real,Test,Probe",
             "queryValue": "",
             "skipUrlSync": false,
             "type": "custom"