diff --git a/brian_dashboard_manager/dashboards/infrastructure_lab.json b/brian_dashboard_manager/dashboards/infrastructure_lab.json
index be761f3bc47b84c048e68968bf94953ee2d31908..d8c841f6372c9f8975ebc2a38f5dcdc11ea778b2 100644
--- a/brian_dashboard_manager/dashboards/infrastructure_lab.json
+++ b/brian_dashboard_manager/dashboards/infrastructure_lab.json
@@ -693,7 +693,7 @@
           "multi": true,
           "name": "interface_name",
           "options": [],
-          "query": "SHOW TAG VALUES ON poller WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
+          "query": "SHOW TAG VALUES ON test_brian WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
           "refresh": 1,
           "regex": "",
           "skipUrlSync": false,
diff --git a/brian_dashboard_manager/templating/templates/homedashboard.json.j2 b/brian_dashboard_manager/templating/templates/homedashboard.json.j2
index 1537116bf8efbfd5e485a4487dd259bdc1e9f583..7e2b37a51257ea8c25aa47d9b168a38b4e672cb4 100644
--- a/brian_dashboard_manager/templating/templates/homedashboard.json.j2
+++ b/brian_dashboard_manager/templating/templates/homedashboard.json.j2
@@ -734,14 +734,14 @@
       {
         "allValue": null,
         "datasource": "PollerInfluxDB",
-        "definition": "SHOW TAG VALUES ON poller WITH KEY=hostname",
+        "definition": "SHOW TAG VALUES WITH KEY=hostname",
         "hide": 0,
         "includeAll": false,
         "label": "Router:",
         "multi": false,
         "name": "hostname",
         "options": [],
-        "query": "SHOW TAG VALUES ON poller WITH KEY=hostname",
+        "query": "SHOW TAG VALUES WITH KEY=hostname",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -755,14 +755,14 @@
       {
         "allValue": null,
         "datasource": "PollerInfluxDB",
-        "definition": "SHOW TAG VALUES ON poller WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
+        "definition": "SHOW TAG VALUES WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
         "hide": 0,
         "includeAll": false,
         "label": "Interface :",
         "multi": false,
         "name": "interface_name",
         "options": [],
-        "query": "SHOW TAG VALUES ON poller WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
+        "query": "SHOW TAG VALUES WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,