diff --git a/plugins/flashrom/flashrom.quirk b/plugins/flashrom/flashrom.quirk
index b1adcd86e..b49e534b5 100644
--- a/plugins/flashrom/flashrom.quirk
+++ b/plugins/flashrom/flashrom.quirk
@@ -7,33 +7,33 @@ Plugin = flashrom
 Plugin = flashrom
 VersionFormat = quad
 
-# Star LabTop Mk III (HwId)
+# StarLite Mk II (HwId)
 [013b60e5-1023-5bee-8ae5-14cae21377b7]
 Plugin = flashrom
 
-# Star LabTop Mk IV (HwId)
-[baf1d04e-fd16-5e6a-93cc-1c23d171f879]
-Plugin = flashrom
-
-# StarBook Mk V (HwId)
-[85aba599-addd-5985-a2e8-eddb41c61ba3]
-Plugin = flashrom
-
-# Star Lite Mk II (HwId)
-[013b60e5-1023-5bee-8ae5-14cae21377b7]
-Plugin = flashrom
-
-# Star Lite Mk III (HwId)
+# StarLite Mk III (HwId)
 [d5521faa-c50b-5d64-971d-8fd400030c51]
 Plugin = flashrom
 
-# Star LabTop Mk III (coreboot GUID)
+# StarLabTop Mk III (HwId)
+[013b60e5-1023-5bee-8ae5-14cae21377b7]
+Plugin = flashrom
+
+# StarLabTop Mk IV (HwId)
+[baf1d04e-fd16-5e6a-93cc-1c23d171f879]
+Plugin = flashrom
+
+# StarBookMk V (HwId)
+[85aba599-addd-5985-a2e8-eddb41c61ba3]
+Plugin = flashrom
+
+# StarLabTop Mk III (coreboot GUID)
 [d33219e2-b84c-53a8-a624-27af9752dba6]
 Branch = coreboot
 VersionFormat = number
 Flags = reset-cmos
 
-# Star LabTop Mk IV (coreboot GUID)
+# StarLabTop Mk IV (coreboot GUID)
 [0ee5867c-93f0-5fb4-adf1-9d686ea1183a]
 Branch = coreboot
 VersionFormat = number
diff --git a/plugins/uefi-capsule/uefi-capsule.quirk b/plugins/uefi-capsule/uefi-capsule.quirk
index ed148d00e..d48b339bf 100644
--- a/plugins/uefi-capsule/uefi-capsule.quirk
+++ b/plugins/uefi-capsule/uefi-capsule.quirk
@@ -1,14 +1,22 @@
-# Star Labs Lite (Mk III)
+# StarLite Mk II
+[797f8bae-0ea2-4c0f-8a30-7d10ccfacbc0]
+Flags = no-ux-capsule,use-shim-unique
+
+# StarLite Mk III
 [d9d7b13b-e4db-4f91-8bf6-8952a9caa82a]
 Flags = no-ux-capsule
 
-# Star Labs LabTop (Mk III)
+# StarLabTop Mk III
 [8265d473-a6c2-42b4-897b-bc220faa2d32]
-Flags = use-shim-unique
+Flags = no-ux-capsule,use-shim-unique
 
-# Star Labs Lite (Mk II)
-[797f8bae-0ea2-4c0f-8a30-7d10ccfacbc0]
-Flags = use-shim-unique,no-ux-capsule
+# StarLabTop Mk IV
+[502bff68-b8db-4b01-86ef-ab65f6502a77]
+Flags = no-ux-capsule
+
+# StarBook Mk V
+[e27d9e98-cbb2-4975-a8f8-261de2adde05]
+Flags = no-ux-capsule
 
 # Silicom Minnowboard Turbot D0/D1 PLATFORM
 [386c2f52-44ec-55d3-b802-47631bfb8451]