diff --git a/ci.sh b/ci.sh
index af93d0b72..8f375eb92 100755
--- a/ci.sh
+++ b/ci.sh
@@ -48,6 +48,7 @@ cargo batch  \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \
+    --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32wb15cc,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32l151cb-a,defmt,exti,time-driver-any,unstable-traits \
@@ -55,6 +56,7 @@ cargo batch  \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32g0c1ve,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32f217zg,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features nightly,stm32l552ze,defmt,exti,time-driver-any,unstable-traits \
+    --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32wl54jc-cm0p,defmt,exti,time-driver-any,unstable-traits \
     --- build --release --manifest-path docs/modules/ROOT/examples/basic/Cargo.toml --target thumbv7em-none-eabi \
     --- build --release --manifest-path docs/modules/ROOT/examples/layer-by-layer/blinky-pac/Cargo.toml --target thumbv7em-none-eabi \
     --- build --release --manifest-path docs/modules/ROOT/examples/layer-by-layer/blinky-hal/Cargo.toml --target thumbv7em-none-eabi \
@@ -76,8 +78,8 @@ cargo batch  \
     --- build --release --manifest-path examples/stm32l1/Cargo.toml --target thumbv7m-none-eabi --out-dir out/examples/stm32l1 \
     --- build --release --manifest-path examples/stm32l4/Cargo.toml --target thumbv7em-none-eabi --out-dir out/examples/stm32l4 \
     --- build --release --manifest-path examples/stm32u5/Cargo.toml --target thumbv8m.main-none-eabihf --out-dir out/examples/stm32u5 \
-    --- build --release --manifest-path examples/stm32wb55/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wb55 \
-    --- build --release --manifest-path examples/stm32wl55/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wl55 \
+    --- build --release --manifest-path examples/stm32wb/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wb \
+    --- build --release --manifest-path examples/stm32wl/Cargo.toml --target thumbv7em-none-eabihf --out-dir out/examples/stm32wl \
     --- build --release --manifest-path examples/wasm/Cargo.toml --target wasm32-unknown-unknown --out-dir out/examples/wasm \
     --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f103c8 --out-dir out/tests/bluepill-stm32f103c8 \
     --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32f429zi --out-dir out/tests/nucleo-stm32f429zi \
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 5579631af..030782466 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -1316,6 +1316,12 @@ stm32u585ri = [ "stm32-metapac/stm32u585ri" ]
 stm32u585vi = [ "stm32-metapac/stm32u585vi" ]
 stm32u585ze = [ "stm32-metapac/stm32u585ze" ]
 stm32u585zi = [ "stm32-metapac/stm32u585zi" ]
+stm32wb10cc = [ "stm32-metapac/stm32wb10cc" ]
+stm32wb15cc = [ "stm32-metapac/stm32wb15cc" ]
+stm32wb30ce = [ "stm32-metapac/stm32wb30ce" ]
+stm32wb35cc = [ "stm32-metapac/stm32wb35cc" ]
+stm32wb35ce = [ "stm32-metapac/stm32wb35ce" ]
+stm32wb50cg = [ "stm32-metapac/stm32wb50cg" ]
 stm32wb55cc = [ "stm32-metapac/stm32wb55cc" ]
 stm32wb55ce = [ "stm32-metapac/stm32wb55ce" ]
 stm32wb55cg = [ "stm32-metapac/stm32wb55cg" ]
@@ -1326,6 +1332,11 @@ stm32wb55vc = [ "stm32-metapac/stm32wb55vc" ]
 stm32wb55ve = [ "stm32-metapac/stm32wb55ve" ]
 stm32wb55vg = [ "stm32-metapac/stm32wb55vg" ]
 stm32wb55vy = [ "stm32-metapac/stm32wb55vy" ]
+stm32wb5mmg = [ "stm32-metapac/stm32wb5mmg" ]
+stm32wl54cc-cm4 = [ "stm32-metapac/stm32wl54cc-cm4" ]
+stm32wl54cc-cm0p = [ "stm32-metapac/stm32wl54cc-cm0p" ]
+stm32wl54jc-cm4 = [ "stm32-metapac/stm32wl54jc-cm4" ]
+stm32wl54jc-cm0p = [ "stm32-metapac/stm32wl54jc-cm0p" ]
 stm32wl55cc-cm4 = [ "stm32-metapac/stm32wl55cc-cm4" ]
 stm32wl55cc-cm0p = [ "stm32-metapac/stm32wl55cc-cm0p" ]
 stm32wl55jc-cm4 = [ "stm32-metapac/stm32wl55jc-cm4" ]
diff --git a/examples/stm32wb55/.cargo/config.toml b/examples/stm32wb/.cargo/config.toml
similarity index 100%
rename from examples/stm32wb55/.cargo/config.toml
rename to examples/stm32wb/.cargo/config.toml
diff --git a/examples/stm32wb55/Cargo.toml b/examples/stm32wb/Cargo.toml
similarity index 95%
rename from examples/stm32wb55/Cargo.toml
rename to examples/stm32wb/Cargo.toml
index 8997d411d..d797b9c78 100644
--- a/examples/stm32wb55/Cargo.toml
+++ b/examples/stm32wb/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
 edition = "2018"
-name = "embassy-stm32wb55-examples"
+name = "embassy-stm32wb-examples"
 version = "0.1.0"
 resolver = "2"
 
diff --git a/examples/stm32wb55/build.rs b/examples/stm32wb/build.rs
similarity index 100%
rename from examples/stm32wb55/build.rs
rename to examples/stm32wb/build.rs
diff --git a/examples/stm32wb55/memory.x b/examples/stm32wb/memory.x
similarity index 100%
rename from examples/stm32wb55/memory.x
rename to examples/stm32wb/memory.x
diff --git a/examples/stm32wb55/src/bin/blinky.rs b/examples/stm32wb/src/bin/blinky.rs
similarity index 100%
rename from examples/stm32wb55/src/bin/blinky.rs
rename to examples/stm32wb/src/bin/blinky.rs
diff --git a/examples/stm32wb55/src/bin/button_exti.rs b/examples/stm32wb/src/bin/button_exti.rs
similarity index 100%
rename from examples/stm32wb55/src/bin/button_exti.rs
rename to examples/stm32wb/src/bin/button_exti.rs
diff --git a/examples/stm32wl55/.cargo/config.toml b/examples/stm32wl/.cargo/config.toml
similarity index 100%
rename from examples/stm32wl55/.cargo/config.toml
rename to examples/stm32wl/.cargo/config.toml
diff --git a/examples/stm32wl55/Cargo.toml b/examples/stm32wl/Cargo.toml
similarity index 97%
rename from examples/stm32wl55/Cargo.toml
rename to examples/stm32wl/Cargo.toml
index 97b38aeab..e95a009ce 100644
--- a/examples/stm32wl55/Cargo.toml
+++ b/examples/stm32wl/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>", "Ulf Lilleengen <ulf.lilleengen@gmail.com>"]
 edition = "2018"
-name = "embassy-stm32wl55-examples"
+name = "embassy-stm32wl-examples"
 version = "0.1.0"
 resolver = "2"
 
diff --git a/examples/stm32wl55/build.rs b/examples/stm32wl/build.rs
similarity index 100%
rename from examples/stm32wl55/build.rs
rename to examples/stm32wl/build.rs
diff --git a/examples/stm32wl55/src/bin/blinky.rs b/examples/stm32wl/src/bin/blinky.rs
similarity index 100%
rename from examples/stm32wl55/src/bin/blinky.rs
rename to examples/stm32wl/src/bin/blinky.rs
diff --git a/examples/stm32wl55/src/bin/button.rs b/examples/stm32wl/src/bin/button.rs
similarity index 100%
rename from examples/stm32wl55/src/bin/button.rs
rename to examples/stm32wl/src/bin/button.rs
diff --git a/examples/stm32wl55/src/bin/button_exti.rs b/examples/stm32wl/src/bin/button_exti.rs
similarity index 100%
rename from examples/stm32wl55/src/bin/button_exti.rs
rename to examples/stm32wl/src/bin/button_exti.rs
diff --git a/examples/stm32wl55/src/bin/lorawan.rs b/examples/stm32wl/src/bin/lorawan.rs
similarity index 100%
rename from examples/stm32wl55/src/bin/lorawan.rs
rename to examples/stm32wl/src/bin/lorawan.rs
diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl/src/bin/subghz.rs
similarity index 100%
rename from examples/stm32wl55/src/bin/subghz.rs
rename to examples/stm32wl/src/bin/subghz.rs
diff --git a/stm32-gen-features/src/lib.rs b/stm32-gen-features/src/lib.rs
index c9768cdbb..bef11c2ad 100644
--- a/stm32-gen-features/src/lib.rs
+++ b/stm32-gen-features/src/lib.rs
@@ -3,22 +3,8 @@
 use std::{iter::FilterMap, path::Path, slice::Iter};
 
 const SUPPORTED_FAMILIES: &[&str] = &[
-    "stm32f0",
-    "stm32f1",
-    "stm32f2",
-    "stm32f3",
-    "stm32f4",
-    "stm32f7",
-    "stm32g0",
-    "stm32g4",
-    "stm32l0",
-    "stm32l1",
-    "stm32l4",
-    "stm32l5",
-    "stm32h7",
-    "stm32u5",
-    "stm32wb55",
-    "stm32wl55",
+    "stm32f0", "stm32f1", "stm32f2", "stm32f3", "stm32f4", "stm32f7", "stm32g0", "stm32g4",
+    "stm32l0", "stm32l1", "stm32l4", "stm32l5", "stm32h7", "stm32u5", "stm32wb", "stm32wl5",
 ];
 
 const SEPARATOR_START: &str = "# BEGIN GENERATED FEATURES\n";