diff --git a/node-mixin/dashboards/node.libsonnet b/node-mixin/dashboards/node.libsonnet
index 943864f9..ba092cf7 100644
--- a/node-mixin/dashboards/node.libsonnet
+++ b/node-mixin/dashboards/node.libsonnet
@@ -60,14 +60,9 @@ local gauge = promgrafonnet.gauge;
       local memoryGauge = gauge.new(
         'Memory Usage',
         |||
-          (
+            node_memory_MemAvailable{%(nodeExporterSelector)s, instance="$instance"}
+          /
             node_memory_MemTotal{%(nodeExporterSelector)s, instance="$instance"}
-          - node_memory_MemFree{%(nodeExporterSelector)s, instance="$instance"}
-          - node_memory_Buffers{%(nodeExporterSelector)s, instance="$instance"}
-          - node_memory_Cached{%(nodeExporterSelector)s, instance="$instance"}
-          ) * 100
-            /
-          node_memory_MemTotal{%(nodeExporterSelector)s, instance="$instance"}
         ||| % $._config,
       ).withLowerBeingBetter();
 
@@ -100,12 +95,11 @@ local gauge = promgrafonnet.gauge;
       local diskSpaceUsage = gauge.new(
         'Disk Space Usage',
         |||
-          (
-            sum(node_filesystem_size{%(nodeExporterSelector)s, device!="rootfs", instance="$instance"})
-          - sum(node_filesystem_free{%(nodeExporterSelector)s, device!="rootfs", instance="$instance"})
-          ) * 100
+          1 - (
+              sum(node_filesystem_free{%(nodeExporterSelector)s, device!="rootfs", instance="$instance"}
             /
-          sum(node_filesystem_size{%(nodeExporterSelector)s, device!="rootfs", instance="$instance"})
+              sum(node_filesystem_size{%(nodeExporterSelector)s, device!="rootfs", instance="$instance"}
+          )
         ||| % $._config,
       ).withLowerBeingBetter();
 
diff --git a/node-mixin/lib/promgrafonnet/gauge.libsonnet b/node-mixin/lib/promgrafonnet/gauge.libsonnet
index ea6c1ab6..f69a5cdc 100644
--- a/node-mixin/lib/promgrafonnet/gauge.libsonnet
+++ b/node-mixin/lib/promgrafonnet/gauge.libsonnet
@@ -8,7 +8,7 @@ local prometheus = grafana.prometheus;
       title,
       datasource='prometheus',
       span=3,
-      format='percent',
+      format='percentunit',
       valueName='current',
       colors=[
         'rgba(245, 54, 54, 0.9)',