diff --git a/salt/grafana/panels/estimated_eps_singlestat.json.jinja b/salt/grafana/panels/estimated_eps_singlestat.json.jinja
index d4c13ecc1..e2dee3398 100644
--- a/salt/grafana/panels/estimated_eps_singlestat.json.jinja
+++ b/salt/grafana/panels/estimated_eps_singlestat.json.jinja
@@ -8,17 +8,11 @@
     "rgba(50, 172, 45, 0.97)"
   ],
   "datasource": "InfluxDB",
-  "decimals": 2,
+  "decimals": 0,
   "editable": true,
   "error": false,
-  "format": "percent",
-  "gauge": {
-    "maxValue": 100,
-    "minValue": 0,
-    "show": false,
-    "thresholdLabels": false,
-    "thresholdMarkers": true
-  },
+  "format": "short",
+  "gauge": {},
   "gridPos": {
     "x": {{ PANELS.estimated_eps_singlestat.gridPos.x }},
     "y": {{ PANELS.estimated_eps_singlestat.gridPos.y }},
diff --git a/salt/grafana/panels/nsm_used_guage.json.jinja b/salt/grafana/panels/nsm_used_guage.json.jinja
index 5aabb921f..e6ae2d2b5 100644
--- a/salt/grafana/panels/nsm_used_guage.json.jinja
+++ b/salt/grafana/panels/nsm_used_guage.json.jinja
@@ -103,8 +103,8 @@
       "orderByTime": "ASC"
     }
   ],
-  "thresholds": "70,80,90",
-  "title": "RootFS used",
+  "thresholds": "70,80,95",
+  "title": "NSM used",
   "type": "singlestat",
   "valueFontSize": "80%",
   "valueMaps": [