diff --git a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
index 607c9e3c1..48743d013 100644
--- a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
@@ -5,14 +5,14 @@
   "editable": true,
   "fill": 1,
   "grid": {},
-    "gridPos": {
+  "gridPos": {
     "x": {{ PANELS.cpu_usage_tasks_graph.gridPos.x }},
     "y": {{ PANELS.cpu_usage_tasks_graph.gridPos.y }},
     "w": {{ PANELS.cpu_usage_tasks_graph.gridPos.w }},
     "h": {{ PANELS.cpu_usage_tasks_graph.gridPos.h }}
   },
   "height": "300",
-  "id": 28239,
+  "id": 27,
   "interval": "$inter",
   "legend": {
     "alignAsTable": true,
@@ -62,7 +62,7 @@
         }
       ],
       "hide": false,
-      "measurement": "cpu_percentageBusy",
+      "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), *",
       "rawQuery": true,
diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja
index 92080618f..72e770c2c 100644
--- a/salt/grafana/panels/load_averages_graph.json.jinja
+++ b/salt/grafana/panels/load_averages_graph.json.jinja
@@ -16,7 +16,7 @@
     "h": {{ PANELS.load_averages_graph.gridPos.h }}
   },
   "height": "350",
-  "id": 54694,
+  "id": 21,
   "interval": "$inter",
   "legend": {
     "alignAsTable": true,
@@ -64,7 +64,7 @@
           "type": "tag"
         }
       ],
-      "measurement": "system_load1",
+      "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",
       "rawQuery": true,