diff --git a/grafana/scylla-os.template.json b/grafana/scylla-os.template.json
index e3cc6ee5ee..22ef972bc2 100644
--- a/grafana/scylla-os.template.json
+++ b/grafana/scylla-os.template.json
@@ -32,6 +32,8 @@
                         "class": "piechart_panel_percent",
                         "height": "250px",
                         "repeat": "node",
+                        "maxPerRow": 8,
+                        "repeatDirection": "h",
                         "targets": [
                             {
                                 "expr": "sum(node_filesystem_avail_bytes{mountpoint=~\"$mount_point\", instance=~\"$node\", job=~\"node_exporter.*\"})",
diff --git a/grafana/types.json b/grafana/types.json
index ea31cb0404..fa7b5caaf6 100644
--- a/grafana/types.json
+++ b/grafana/types.json
@@ -1876,7 +1876,8 @@
               "percent"
             ],
             "tooltip": {
-              "mode": "single"
+              "mode": "multi",
+              "sort": "none"
             },
             "legend": {
               "displayMode": "hidden",