diff --git a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
index 48743d013..5e3e43c03 100644
--- a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
@@ -64,7 +64,7 @@
       "hide": false,
       "measurement": "cpu",
       "policy": "default",
-      "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\"  FROM \"cpu\" WHERE \"host\" =~ /$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($interval), *",
+      "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\"  FROM \"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($interval), *",
       "rawQuery": true,
       "refId": "B",
       "resultFormat": "time_series",
diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja
index f4e99e691..6c263c2f1 100644
--- a/salt/grafana/panels/load_averages_graph.json.jinja
+++ b/salt/grafana/panels/load_averages_graph.json.jinja
@@ -66,7 +66,7 @@
       ],
       "measurement": "system",
       "policy": "default",
-      "query": "SELECT mean(load1) as 1m,mean(load5) as 5m,mean(load15) as 15m FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), * ORDER BY asc",
+      "query": "SELECT mean(load1) as 1m,mean(load5) as 5m,mean(load15) as 15m FROM \"system\" WHERE host =~ /^$servername$/ AND $timeFilter GROUP BY time($interval), * ORDER BY asc",
       "rawQuery": true,
       "refId": "A",
       "resultFormat": "time_series",