diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index b1284989..93b73bdb 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1274,8 +1274,13 @@ def scan_disks(full_paths=False, only_path=None):
                 TESTS['iobenchmark']['Status'][d['name']] = 'Pending'
             else:
                 # Skip WizardKit devices
-                wk_label = '{}_LINUX'.format(KIT_NAME_SHORT)
-                if wk_label not in [c.get('label', '') for c in d.get('children', [])]:
+                skip_dev=False
+                wk_label_regex = r'{}_(LINUX|UFD)'.format(KIT_NAME_SHORT)
+                for c in d.get('children', []):
+                    r = re.search(
+                        wk_label_regex, c.get('label', ''), re.IGNORECASE)
+                    skip_dev = bool(r)
+                if not skip_dev:
                     devs[d['name']] = {'lsblk': d}
                     TESTS['NVMe/SMART']['Status'][d['name']] = 'Pending'
                     TESTS['badblocks']['Status'][d['name']] = 'Pending'