diff --git a/salt/grafana/panels/cpu_docker_combined.json.jinja b/salt/grafana/panels/cpu_docker_combined.json.jinja
index 7fe3ed685..0d151e44c 100644
--- a/salt/grafana/panels/cpu_docker_combined.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined.json.jinja
@@ -57,13 +57,13 @@
           {
             "type": "math",
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ]
           }
         ]
       ],
       "measurement": "docker_container_cpu",
-      "query": "SELECT mean(\"usage_percent\")  /$cpucount FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-elasticsearch') AND $timeFilter GROUP BY time($__interval) fill(null)",
+      "query": "SELECT mean(\"usage_percent\")  /'$cpucount' FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-elasticsearch') AND $timeFilter GROUP BY time($__interval) fill(null)",
       "rawQuery": false,
       "hide": false,
       "alias": "elasticsearch"
@@ -116,7 +116,7 @@
           {
             "type": "math",
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ]
           }
         ]
@@ -172,7 +172,7 @@
           {
             "type": "math",
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ]
           }
         ]
@@ -228,7 +228,7 @@
           {
             "type": "math",
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ]
           }
         ]
@@ -284,7 +284,7 @@
           {
             "type": "math",
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ]
           }
         ]
@@ -340,7 +340,7 @@
           {
             "type": "math",
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ]
           }
         ]
@@ -396,7 +396,7 @@
           {
             "type": "math",
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ]
           }
         ]
@@ -452,7 +452,7 @@
           {
             "type": "math",
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ]
           }
         ]
@@ -508,7 +508,7 @@
           {
             "type": "math",
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ]
           }
         ]
diff --git a/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja b/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja
index c607fc655..350f41321 100644
--- a/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja
+++ b/salt/grafana/panels/elasticsearch_cpu_usage.json.jinja
@@ -91,7 +91,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -148,7 +148,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/influxdb_cpu_usage.json.jinja b/salt/grafana/panels/influxdb_cpu_usage.json.jinja
index 2fd644446..51a652506 100644
--- a/salt/grafana/panels/influxdb_cpu_usage.json.jinja
+++ b/salt/grafana/panels/influxdb_cpu_usage.json.jinja
@@ -88,7 +88,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -144,7 +144,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/kibana_cpu_usage.json.jinja b/salt/grafana/panels/kibana_cpu_usage.json.jinja
index 59e9c80b2..d6d17e74e 100644
--- a/salt/grafana/panels/kibana_cpu_usage.json.jinja
+++ b/salt/grafana/panels/kibana_cpu_usage.json.jinja
@@ -88,7 +88,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -144,7 +144,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/logstash_cpu_usage.json.jinja b/salt/grafana/panels/logstash_cpu_usage.json.jinja
index 1fc128802..392572a9b 100644
--- a/salt/grafana/panels/logstash_cpu_usage.json.jinja
+++ b/salt/grafana/panels/logstash_cpu_usage.json.jinja
@@ -88,7 +88,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -144,7 +144,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/redis_cpu_usage.json.jinja b/salt/grafana/panels/redis_cpu_usage.json.jinja
index 0004c39ab..92b225e86 100644
--- a/salt/grafana/panels/redis_cpu_usage.json.jinja
+++ b/salt/grafana/panels/redis_cpu_usage.json.jinja
@@ -72,7 +72,7 @@
       "measurement": "docker_container_cpu",
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(\"usage_percent\") /$cpucount FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
+      "query": "SELECT mean(\"usage_percent\") /'$cpucount' FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
       "rawQuery": false,
       "refId": "A",
       "resultFormat": "time_series",
@@ -90,7 +90,7 @@
           },
           {
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ],
             "type": "math"
           }
@@ -130,7 +130,7 @@
       "measurement": "docker_container_cpu",
       "orderByTime": "ASC",
       "policy": "so_long_term",
-      "query": "SELECT mean(\"usage_percent\") /$cpucount FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
+      "query": "SELECT mean(\"usage_percent\") /'$cpucount' FROM \"docker_container_cpu\" WHERE (\"host\" = '$servername' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
       "rawQuery": false,
       "refId": "B",
       "resultFormat": "time_series",
@@ -148,7 +148,7 @@
           },
           {
             "params": [
-              "/$cpucount"
+              "/'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/stenographer_cpu_usage.json.jinja b/salt/grafana/panels/stenographer_cpu_usage.json.jinja
index 94a6cf983..3715f1482 100644
--- a/salt/grafana/panels/stenographer_cpu_usage.json.jinja
+++ b/salt/grafana/panels/stenographer_cpu_usage.json.jinja
@@ -82,7 +82,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -139,7 +139,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/suricata_cpu_usage.json.jinja b/salt/grafana/panels/suricata_cpu_usage.json.jinja
index adb2ef9fc..f2e5488af 100644
--- a/salt/grafana/panels/suricata_cpu_usage.json.jinja
+++ b/salt/grafana/panels/suricata_cpu_usage.json.jinja
@@ -91,7 +91,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -148,7 +148,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
diff --git a/salt/grafana/panels/zeek_cpu_usage.json.jinja b/salt/grafana/panels/zeek_cpu_usage.json.jinja
index 0a63548da..5215d038d 100644
--- a/salt/grafana/panels/zeek_cpu_usage.json.jinja
+++ b/salt/grafana/panels/zeek_cpu_usage.json.jinja
@@ -91,7 +91,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }
@@ -148,7 +148,7 @@
           },
           {
             "params": [
-              " /$cpucount"
+              " /'$cpucount'"
             ],
             "type": "math"
           }