diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs
index 0ee3b1e..143963d 100644
--- a/stm32-data-gen/src/chips.rs
+++ b/stm32-data-gen/src/chips.rs
@@ -809,9 +809,6 @@ static NOPELIST: &[&str] = &[
     // not supported yet, planned. Pull requests welcome!
     "STM32H7R",
     "STM32H7S",
-    "STM32WBA50",
-    "STM32WBA54",
-    "STM32WBA55",
     // Does not exist in ST website. No datasheet, no RM.
     "STM32GBK",
     "STM32L485",
diff --git a/stm32-data-gen/src/interrupts.rs b/stm32-data-gen/src/interrupts.rs
index f14ce13..400fe0c 100644
--- a/stm32-data-gen/src/interrupts.rs
+++ b/stm32-data-gen/src/interrupts.rs
@@ -516,7 +516,7 @@ static PICK_NVIC: RegexMap<&str> = RegexMap::new(&[
     ("STM32WL5.*:cm4", "NVIC1"),
     ("STM32WL5.*:cm0p", "NVIC2"),
     // Exception 2: TrustZone: NVIC1 is Secure mode, NVIC2 is NonSecure mode. For now, we pick the NonSecure one.
-    ("STM32(L5|U5|H5[2367]|WBA).*", "NVIC2"),
+    ("STM32(L5|U5|H5[2367]|WBA5[245]).*", "NVIC2"),
     // catch-all: Most chips have a single NVIC, named "NVIC"
     (".*", "NVIC"),
 ]);