diff --git a/assets/grafana/all-nodes.json b/assets/grafana/all-nodes.json
index a3df1ec0429748db4a25bbaab690e315ed36e95f..4e07445d2fe5b9eb6998d348194cb12f65299e6b 100644
--- a/assets/grafana/all-nodes.json
+++ b/assets/grafana/all-nodes.json
@@ -299,7 +299,7 @@
               "yaxis": 2
             }
           ],
-          "span": 10,
+          "span": 9,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -395,7 +395,7 @@
               "to": "null"
             }
           ],
-          "span": 2,
+          "span": 3,
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -487,7 +487,7 @@
               "yaxis": 2
             }
           ],
-          "span": 10,
+          "span": 9,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -597,7 +597,7 @@
               "to": "null"
             }
           ],
-          "span": 2,
+          "span": 3,
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -863,7 +863,7 @@
   },
   "refresh": false,
   "schemaVersion": 12,
-  "version": 5,
+  "version": 10,
   "links": [],
   "gnetId": 22
 }
\ No newline at end of file
diff --git a/assets/grafana/node.json b/assets/grafana/node.json
index be9fdfea5c1773701e061a39642c4e1d6ac13f92..10ded0ffe643bd7e3de115cfca989f7010a678ec 100644
--- a/assets/grafana/node.json
+++ b/assets/grafana/node.json
@@ -299,7 +299,7 @@
               "yaxis": 2
             }
           ],
-          "span": 10,
+          "span": 9,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -395,7 +395,7 @@
               "to": "null"
             }
           ],
-          "span": 2,
+          "span": 3,
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -487,7 +487,7 @@
               "yaxis": 2
             }
           ],
-          "span": 10,
+          "span": 9,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -597,7 +597,7 @@
               "to": "null"
             }
           ],
-          "span": 2,
+          "span": 3,
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -606,7 +606,7 @@
           },
           "targets": [
             {
-              "expr": "min(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"} / node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})",
+              "expr": "sum(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"}) / sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})",
               "intervalFactor": 2,
               "refId": "A",
               "step": 60,
@@ -614,7 +614,7 @@
             }
           ],
           "thresholds": "0.10, 0.25",
-          "title": "Free disk space (lowest mountpoint)",
+          "title": "Free disk space",
           "type": "singlestat",
           "valueFontSize": "80%",
           "valueMaps": [
@@ -876,7 +876,7 @@
   },
   "refresh": false,
   "schemaVersion": 12,
-  "version": 0,
+  "version": 1,
   "links": [],
   "gnetId": 22
 }
\ No newline at end of file
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml
index 9e66bef5dba9907c7f825cce2c3fb993200d2a39..b42c65576a1bb1220c417346b7207682e9943a1f 100644
--- a/manifests/grafana/grafana-cm.yaml
+++ b/manifests/grafana/grafana-cm.yaml
@@ -302,7 +302,7 @@ data:
                   "yaxis": 2
                 }
               ],
-              "span": 10,
+              "span": 9,
               "stack": false,
               "steppedLine": false,
               "targets": [
@@ -398,7 +398,7 @@ data:
                   "to": "null"
                 }
               ],
-              "span": 2,
+              "span": 3,
               "sparkline": {
                 "fillColor": "rgba(31, 118, 189, 0.18)",
                 "full": false,
@@ -490,7 +490,7 @@ data:
                   "yaxis": 2
                 }
               ],
-              "span": 10,
+              "span": 9,
               "stack": false,
               "steppedLine": false,
               "targets": [
@@ -600,7 +600,7 @@ data:
                   "to": "null"
                 }
               ],
-              "span": 2,
+              "span": 3,
               "sparkline": {
                 "fillColor": "rgba(31, 118, 189, 0.18)",
                 "full": false,
@@ -866,7 +866,7 @@ data:
       },
       "refresh": false,
       "schemaVersion": 12,
-      "version": 5,
+      "version": 10,
       "links": [],
       "gnetId": 22
     }
@@ -1583,7 +1583,7 @@ data:
                   "yaxis": 2
                 }
               ],
-              "span": 10,
+              "span": 9,
               "stack": false,
               "steppedLine": false,
               "targets": [
@@ -1679,7 +1679,7 @@ data:
                   "to": "null"
                 }
               ],
-              "span": 2,
+              "span": 3,
               "sparkline": {
                 "fillColor": "rgba(31, 118, 189, 0.18)",
                 "full": false,
@@ -1771,7 +1771,7 @@ data:
                   "yaxis": 2
                 }
               ],
-              "span": 10,
+              "span": 9,
               "stack": false,
               "steppedLine": false,
               "targets": [
@@ -1881,7 +1881,7 @@ data:
                   "to": "null"
                 }
               ],
-              "span": 2,
+              "span": 3,
               "sparkline": {
                 "fillColor": "rgba(31, 118, 189, 0.18)",
                 "full": false,
@@ -1890,7 +1890,7 @@ data:
               },
               "targets": [
                 {
-                  "expr": "min(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"} / node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})",
+                  "expr": "sum(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"}) / sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})",
                   "intervalFactor": 2,
                   "refId": "A",
                   "step": 60,
@@ -1898,7 +1898,7 @@ data:
                 }
               ],
               "thresholds": "0.10, 0.25",
-              "title": "Free disk space (lowest mountpoint)",
+              "title": "Free disk space",
               "type": "singlestat",
               "valueFontSize": "80%",
               "valueMaps": [
@@ -2160,7 +2160,7 @@ data:
       },
       "refresh": false,
       "schemaVersion": 12,
-      "version": 0,
+      "version": 1,
       "links": [],
       "gnetId": 22
     }