diff --git a/monitoring/rules/base-alerts.yml b/monitoring/rules/base-alerts.yml
index 08daece..2a000d1 100644
--- a/monitoring/rules/base-alerts.yml
+++ b/monitoring/rules/base-alerts.yml
@@ -65,22 +65,22 @@ groups:
           description: "<10% free on {{ $labels.mountpoint }}"
 
       - alert: DiskUsageHigh
-        expr: (1 - (node_filesystem_avail_bytes{mountpoint="/",fstype!~"tmpfs|overlay"} / node_filesystem_size_bytes{mountpoint="/",fstype!~"tmpfs|overlay"})) > 0.85
+        expr: (1 - (node_filesystem_avail_bytes{fstype!~"tmpfs|overlay",mountpoint!~"/boot/efi"} / node_filesystem_size_bytes{fstype!~"tmpfs|overlay",mountpoint!~"/boot/efi"})) > 0.85
         for: 15m
         labels:
           severity: warning
         annotations:
           summary: "Disk usage >85% on {{ $labels.instance }}"
-          description: "Root filesystem usage above 85%"
+          description: "{{ $labels.mountpoint }} usage above 85%"
 
       - alert: DiskUsageCritical
-        expr: (1 - (node_filesystem_avail_bytes{mountpoint="/",fstype!~"tmpfs|overlay"} / node_filesystem_size_bytes{mountpoint="/",fstype!~"tmpfs|overlay"})) > 0.95
+        expr: (1 - (node_filesystem_avail_bytes{fstype!~"tmpfs|overlay",mountpoint!~"/boot/efi"} / node_filesystem_size_bytes{fstype!~"tmpfs|overlay",mountpoint!~"/boot/efi"})) > 0.95
         for: 5m
         labels:
           severity: critical
         annotations:
           summary: "Disk usage >95% on {{ $labels.instance }}"
-          description: "Root filesystem usage above 95%"
+          description: "{{ $labels.mountpoint }} usage above 95%"
 
       - alert: DockerContainerDown
         expr: time() - container_last_seen > 120