diff --git a/chart/proxmox-exporter/Chart.yaml b/chart/proxmox-exporter/Chart.yaml
index 3790f15..70e7d87 100644
--- a/chart/proxmox-exporter/Chart.yaml
+++ b/chart/proxmox-exporter/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.5
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/chart/proxmox-exporter/templates/prometheusrule.yaml b/chart/proxmox-exporter/templates/prometheusrule.yaml
index 1640a0c..5c00d33 100644
--- a/chart/proxmox-exporter/templates/prometheusrule.yaml
+++ b/chart/proxmox-exporter/templates/prometheusrule.yaml
@@ -68,8 +68,8 @@ spec:
 
         - alert: ProxmoxCertificateExpiring
           annotations:
-            summary: Proxmox certificate on node {{ printf "{{ $labels.node }}" }} is expiring in 7 days
-            description: The certificate with subject {{ printf "{{ $labels.subject }}" }} on that node is expiring soon!
+            summary: Proxmox certificate on node {{ printf "{{ $labels.node }}" }} is expiring in a week
+            description: The certificate with subject {{ printf "{{ $labels.subject }}" }} on that node is expiring in {{ printf "{{ $value }}" }} days
           expr: |
             proxmox_node_days_until_cert_expiration < 7
           for: 5m
@@ -77,11 +77,49 @@ spec:
             severity: critical
         - alert: ProxmoxCertificateExpiringWarning
           annotations:
-            summary: Proxmox certificate on node {{ printf "{{ $labels.node }}" }} is expiring in 14 days
-            description: The certificate with subject {{ printf "{{ $labels.subject }}" }} on that node is expiring soon
+            summary: Proxmox certificate on node {{ printf "{{ $labels.node }}" }} is expiring soon
+            description: The certificate with subject {{ printf "{{ $labels.subject }}" }} on that node is expiring in {{ printf "{{ $value }}" }} days
           expr: |
             proxmox_node_days_until_cert_expiration < 14
           for: 5m
           labels:
             severity: warning
+
+        - alert: ProxmoxUnsharedStorageNearlyFull
+          annotations:
+            summary: Proxmox storage volume {{ printf "{{ $labels.node }}" }}/{{ printf "{{ $labels.storage }}" }} nearly full
+            description: Volume of type {{ printf "{{ $labels.type }}" }} is {{ printf "{{ $value }}" }}% full
+          expr: |
+            100 * (sum by (storage,node) (proxmox_node_storage_used_bytes{shared="false"}) / sum by (storage,node) (proxmox_node_storage_total_bytes)) > 90
+          for: 5m
+          labels:
+            severity: critical
+        - alert: ProxmoxUnsharedStorageFilling
+          annotations:
+            summary: Proxmox storage volume {{ printf "{{ $labels.node }}" }}/{{ printf "{{ $labels.storage }}" }} nearly full
+            description: Volume of type {{ printf "{{ $labels.type }}" }} is {{ printf "{{ $value }}" }}% full
+          expr: |
+            100 * (sum by (storage,node) (proxmox_node_storage_used_bytes{shared="false"}) / sum by (storage,node) (proxmox_node_storage_total_bytes)) > 80
+          for: 5m
+          labels:
+            severity: warning
+
+        - alert: ProxmoxSharedStorageNearlyFull
+          annotations:
+            summary: Proxmox shared storage volume {{ printf "{{ $labels.storage }}" }} nearly full
+            description: Volume of type {{ printf "{{ $labels.type }}" }} is {{ printf "{{ $value }}" }}% full
+          expr: |
+            100 * (sum by (storage) (proxmox_node_storage_used_bytes{shared="true"}) / sum by (storage) (proxmox_node_storage_total_bytes)) > 90
+          for: 5m
+          labels:
+            severity: critical
+        - alert: ProxmoxSharedStorageFilling
+          annotations:
+            summary: Proxmox shared storage volume {{ printf "{{ $labels.storage }}" }} nearly full
+            description: Volume of type {{ printf "{{ $labels.type }}" }} is {{ printf "{{ $value }}" }}% full
+          expr: |
+            100 * (sum by (storage) (proxmox_node_storage_used_bytes{shared="true"}) / sum by (storage) (proxmox_node_storage_total_bytes)) > 80
+          for: 5m
+          labels:
+            severity: warning
 {{- end }}