diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 4ad09054..8ec70963 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -96,7 +96,8 @@ STATUS_COLORS = {
   'TimedOut': 'RED',
   }
 VOLUME_REGEX = re.compile(
-  r'^(?P<dev>.*?) (?P<result>Failed to mount|Mounted on|\S+$)'
+  r'^(?P<dev>.*?) '
+  r'(?P<result>(APFS|CoreStorage) container|Failed to mount|Mounted on|\S+$)'
   r'($| (?P<path>.*) \((?P<details>.*)\))'
 )