diff --git a/defaults/main.yml b/defaults/main.yml
index 942c76a..ac62391 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -229,7 +229,7 @@ prometheus_agent:
       group: nodeexporter
       alert: DiscFilling
       enabled: True
-      expr: predict_linear(node_filesystem_free_bytes{fstype!~"tmpfs", job="node", instance="{{ inventory_hostname }}"}[12h], 24 * 3600) < 0
+      expr: predict_linear((min by (instance, mountpoint) (node_filesystem_free_bytes{fstype!~"tmpfs", job="node", instance="{{ inventory_hostname }}"}))[12h:1m], 24 * 3600) < 0
       for: 5m
       labels:
         severity: warning
@@ -240,7 +240,7 @@ prometheus_agent:
       group: nodeexporter
       alert: DiscFilling
       enabled: True
-      expr: predict_linear(node_filesystem_free_bytes{fstype!~"tmpfs", job="node", instance="{{ inventory_hostname }}"}[12h], 3 * 3600) < 0
+      expr: predict_linear((min by (instance, mountpoint) (node_filesystem_free_bytes{fstype!~"tmpfs", job="node", instance="{{ inventory_hostname }}"}))[12h:1m], 3 * 3600) < 0
       for: 5m
       labels:
         severity: critical