diff --git a/roles/float-infra-prometheus/templates/grafana/dashboards/host.json b/roles/float-infra-prometheus/templates/grafana/dashboards/host.json
index e73a59cc827d43e86d50b527f339e4e41b209720..d3d4778b2a48925464b6c28a1eb38c96e177e684 100644
--- a/roles/float-infra-prometheus/templates/grafana/dashboards/host.json
+++ b/roles/float-infra-prometheus/templates/grafana/dashboards/host.json
@@ -1068,7 +1068,7 @@
             "type": "prometheus",
             "uid": "P49960DE5880E8C68"
           },
-          "expr": "irate(node_disk_reads_completed_total{host=~\"$server.*\",device=~\"([vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
+          "expr": "irate(node_disk_reads_completed_total{host=~\"$server.*\",device=~\"(x?[vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
           "format": "time_series",
           "hide": true,
           "intervalFactor": 4,
@@ -1082,7 +1082,7 @@
             "type": "prometheus",
             "uid": "P49960DE5880E8C68"
           },
-          "expr": "irate(node_disk_writes_completed_total{host=~\"$server.*\",device=~\"([vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
+          "expr": "irate(node_disk_writes_completed_total{host=~\"$server.*\",device=~\"(x?[vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
           "format": "time_series",
           "hide": true,
           "intervalFactor": 4,
@@ -1096,7 +1096,7 @@
             "type": "prometheus",
             "uid": "P49960DE5880E8C68"
           },
-          "expr": "irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"([vs]d[a-z]+|nvme.+)\"}[$__rate_interval])irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"([vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
+          "expr": "irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"(x?[vs]d[a-z]+|nvme.+)\"}[$__rate_interval])irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"(x?[vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
           "format": "time_series",
           "hide": true,
           "intervalFactor": 4,
@@ -1110,7 +1110,7 @@
             "type": "prometheus",
             "uid": "P49960DE5880E8C68"
           },
-          "expr": "irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"([vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
+          "expr": "irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"(x?[vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{device}}",
@@ -1218,7 +1218,7 @@
             "type": "prometheus",
             "uid": "P49960DE5880E8C68"
           },
-          "expr": "irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"([vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
+          "expr": "irate(node_disk_io_time_seconds_total{host=~\"$server\",device=~\"(x?[vs]d[a-z]+|nvme.+)\"}[$__rate_interval])",
           "format": "time_series",
           "hide": true,
           "intervalFactor": 4,
@@ -2229,4 +2229,4 @@
   "uid": "W8eE_Qgik",
   "version": 13,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/roles/float-infra-prometheus/templates/rules/rules_disk.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_disk.conf.yml
index d78ffed59280088c7fa970f82a08ae930340495c..e70472b5a5faad0e207371e389d47367885e297d 100644
--- a/roles/float-infra-prometheus/templates/rules/rules_disk.conf.yml
+++ b/roles/float-infra-prometheus/templates/rules/rules_disk.conf.yml
@@ -2,9 +2,9 @@ groups:
 - name: roles/float-infra-prometheus/templates/rules/rules_disk.conf
   rules:
   - record: instance:node_disk_writes_completed_total:irate1m
-    expr: sum(irate(node_disk_writes_completed_total{device=~"([vs]d|nvme).*"}[1m])) WITHOUT (device)
+    expr: sum(irate(node_disk_writes_completed_total{device=~"(x?[vs]d|nvme).*"}[1m])) WITHOUT (device)
   - record: instance:node_disk_reads_completed_total:irate1m
-    expr: sum(irate(node_disk_reads_completed_total{device=~"([vs]d|nvme).*"}[1m])) WITHOUT (device)
+    expr: sum(irate(node_disk_reads_completed_total{device=~"(x?[vs]d|nvme).*"}[1m])) WITHOUT (device)
   - record: volume:used_space:ratio
     expr: 1 - (node_filesystem_avail_bytes / node_filesystem_size_bytes)