diff --git a/salt/common/grafana/grafana_dashboards/master/master.json b/salt/common/grafana/grafana_dashboards/master/master.json
index 471294f8c..bb7305546 100644
--- a/salt/common/grafana/grafana_dashboards/master/master.json
+++ b/salt/common/grafana/grafana_dashboards/master/master.json
@@ -165,7 +165,7 @@
       "error": false,
       "format": "bytes",
       "gauge": {
-        "maxValue": 105545592832,
+        "maxValue": "{{ ROOTFS }}",
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -263,7 +263,7 @@
           ]
         }
       ],
-      "thresholds": "73881914982,94991033548,105545592832",
+      "thresholds": "{{ ROOTFS * '.80'|float }},{{ ROOTFS * '.90'|float }}",
       "title": "{{ SERVERNAME }} - Disk Used(/)",
       "transparent": false,
       "type": "singlestat",
diff --git a/salt/common/grafana/grafana_dashboards/storage_nodes/storage.json b/salt/common/grafana/grafana_dashboards/storage_nodes/storage.json
index 4d7f18a30..8ba6d55f8 100644
--- a/salt/common/grafana/grafana_dashboards/storage_nodes/storage.json
+++ b/salt/common/grafana/grafana_dashboards/storage_nodes/storage.json
@@ -783,7 +783,7 @@
       "error": false,
       "format": "bytes",
       "gauge": {
-        "maxValue": 105545592832,
+        "maxValue": "{{ ROOTFS }}",
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -881,7 +881,7 @@
           ]
         }
       ],
-      "thresholds": "73881914982,94991033548,105545592832",
+      "thresholds": "{{ ROOTFS * '.80'|float }},{{ ROOTFS * '.90'|float }}",
       "title": "{{ SERVERNAME }} - Disk Used(/)",
       "transparent": false,
       "type": "singlestat",
@@ -909,7 +909,7 @@
       "error": false,
       "format": "bytes",
       "gauge": {
-        "maxValue": 105545592832,
+        "maxValue": "{{ NSMFS }}",
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -1007,7 +1007,7 @@
           ]
         }
       ],
-      "thresholds": "73881914982,94991033548,105545592832",
+      "thresholds": "{{ NSMFS * '.80'|float }},{{ NSMFS * '.90'|float }}",
       "title": "{{ SERVERNAME }} - Disk Used(/nsm)",
       "transparent": false,
       "type": "singlestat",