diff --git a/files/dashboards/nfs.json b/files/dashboards/nfs.json
index f83833e..2e831b7 100644
--- a/files/dashboards/nfs.json
+++ b/files/dashboards/nfs.json
@@ -18,11 +18,9 @@
   "description": "NFS Prometheus Dashboard",
   "editable": true,
   "fiscalYearStartMonth": 0,
-  "gnetId": 6257,
   "graphTooltip": 0,
-  "id": 30,
+  "id": 13,
   "links": [],
-  "liveNow": false,
   "panels": [
     {
       "datasource": {
@@ -36,11 +34,13 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 20,
             "gradientMode": "none",
@@ -50,7 +50,7 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineWidth": 1,
             "pointSize": 5,
             "scaleDistribution": {
@@ -72,8 +72,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -92,7 +91,6 @@
         "y": 0
       },
       "id": 243,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -108,11 +106,12 @@
           "sortDesc": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
-      "pluginVersion": "10.1.1",
+      "pluginVersion": "11.6.0",
       "targets": [
         {
           "datasource": {
@@ -121,7 +120,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by (instance) (rate(node_nfs_requests_total{instance=~\"$node\", job=~\"$job\", proto=\"4\"}[5m]))",
+          "expr": "sum by (instance) (rate(node_nfs_requests_total{instance=~\"$node\"}[5m]))",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,
@@ -149,11 +148,13 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "Connections",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 20,
             "gradientMode": "none",
@@ -163,7 +164,7 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineWidth": 1,
             "pointSize": 5,
             "scaleDistribution": {
@@ -185,8 +186,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -205,7 +205,6 @@
         "y": 10
       },
       "id": 267,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -221,11 +220,12 @@
           "sortDesc": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
-      "pluginVersion": "10.1.1",
+      "pluginVersion": "11.6.0",
       "targets": [
         {
           "datasource": {
@@ -234,7 +234,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by (method) (rate(node_nfs_requests_total{instance=~\"$node\", job=~\"$job\", proto=\"4\"}[5m]))",
+          "expr": "sum by (method) (rate(node_nfs_requests_total{instance=~\"$node\"}[5m]))",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,
@@ -263,21 +263,23 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "hue",
+            "fillOpacity": 0,
+            "gradientMode": "none",
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineStyle": {
               "fill": "solid"
             },
@@ -302,8 +304,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -322,7 +323,6 @@
         "y": 20
       },
       "id": 268,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -335,11 +335,12 @@
           "sortDesc": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
-      "pluginVersion": "10.1.1",
+      "pluginVersion": "11.6.0",
       "targets": [
         {
           "datasource": {
@@ -348,13 +349,13 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "100 - (node_filesystem_avail_bytes{instance=~\"$node\", job=\"$job\", fstype=\"nfs4\"} * 100 / node_filesystem_size_bytes{instance=~\"$node\", job=\"$job\", fstype=\"nfs4\"})",
+          "expr": "avg(100 - (node_filesystem_avail_bytes{instance=~\"$node\", fstype=\"$type\"} * 100 / node_filesystem_size_bytes{instance=~\"$node\", fstype=\"$type\"})) by (mountpoint)",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 1,
-          "legendFormat": "{{instance}} {{device}}",
+          "legendFormat": "{{device}}",
           "range": true,
           "refId": "C",
           "step": 240,
@@ -377,13 +378,15 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
-            "fillOpacity": 10,
+            "fillOpacity": 0,
             "gradientMode": "hue",
             "hideFrom": {
               "legend": false,
@@ -391,7 +394,7 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineStyle": {
               "fill": "solid"
             },
@@ -416,8 +419,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -436,7 +438,6 @@
         "y": 20
       },
       "id": 269,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -449,11 +450,12 @@
           "sortDesc": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
-      "pluginVersion": "10.1.1",
+      "pluginVersion": "11.6.0",
       "targets": [
         {
           "datasource": {
@@ -462,13 +464,13 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "node_filesystem_device_error{instance=~\"$node\", job=\"$job\", fstype=\"nfs4\"}",
+          "expr": "avg(node_filesystem_device_error{instance=~\"$node\", fstype=\"$type\"}) by (mountpoint)",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 1,
-          "legendFormat": "{{instance}} {{device}}",
+          "legendFormat": "{{device}}",
           "range": true,
           "refId": "C",
           "step": 240,
@@ -479,65 +481,54 @@
       "type": "timeseries"
     }
   ],
+  "preload": false,
   "refresh": "5m",
-  "schemaVersion": 38,
-  "style": "dark",
+  "schemaVersion": 41,
   "tags": [],
   "templating": {
     "list": [
       {
         "current": {
-          "selected": false,
-          "text": "node",
-          "value": "node"
+          "text": "All",
+          "value": "$__all"
         },
         "datasource": {
           "type": "prometheus",
           "uid": "yPhvsDP7k"
         },
-        "definition": "",
-        "hide": 2,
-        "includeAll": false,
-        "label": "Job",
-        "multi": false,
-        "name": "job",
+        "definition": "label_values(node_boot_time_seconds,instance)",
+        "includeAll": true,
+        "label": "Host:",
+        "name": "node",
         "options": [],
-        "query": "label_values(node_boot_time_seconds, job)",
+        "query": {
+          "qryType": 1,
+          "query": "label_values(node_boot_time_seconds,instance)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
         "refresh": 1,
         "regex": "",
-        "skipUrlSync": false,
         "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
+        "type": "query"
       },
       {
         "current": {
-          "selected": true,
-          "text": [],
-          "value": []
+          "text": "All",
+          "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "yPhvsDP7k"
-        },
-        "definition": "",
-        "hide": 0,
+        "definition": "label_values(node_filesystem_avail_bytes{instance=~\"$node\"},fstype)",
         "includeAll": true,
-        "label": "Host:",
-        "multi": true,
-        "name": "node",
+        "label": "Type",
+        "name": "type",
         "options": [],
-        "query": "label_values(node_boot_time_seconds{job=~\"$job\"}, instance)",
+        "query": {
+          "qryType": 1,
+          "query": "label_values(node_filesystem_avail_bytes{instance=~\"$node\"},fstype)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
         "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
+        "regex": "/^nfs4?.*/",
+        "type": "query"
       }
     ]
   },
@@ -545,34 +536,9 @@
     "from": "now-24h",
     "to": "now"
   },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
+  "timepicker": {},
   "timezone": "browser",
   "title": "NFS",
   "uid": "cc0d5bef-8b9d-47df-8be7-cf75c3efeece",
-  "version": 12,
-  "weekStart": ""
+  "version": 3
 }