diff --git a/demos/STM32/RT-STM32WB55CG-NUCLEO48_USB/cfg/mcuconf.h b/demos/STM32/RT-STM32WB55CG-NUCLEO48_USB/cfg/mcuconf.h
index fe00c3bb1..5f15fdc30 100644
--- a/demos/STM32/RT-STM32WB55CG-NUCLEO48_USB/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32WB55CG-NUCLEO48_USB/cfg/mcuconf.h
@@ -43,8 +43,9 @@
 #define STM32_PLS                           STM32_PLS_LEV0
 #define STM32_HSI16_ENABLED                 TRUE
 #define STM32_HSI48_ENABLED                 FALSE
-#define STM32_LSI_ENABLED                   TRUE
-#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSI1_ENABLED                  TRUE
+#define STM32_LSI2_ENABLED                  FALSE
+#define STM32_HSE32_ENABLED                 TRUE
 #define STM32_LSE_ENABLED                   TRUE
 #define STM32_MSIPLL_ENABLED                TRUE
 #define STM32_MSIRANGE                      STM32_MSIRANGE_4M
@@ -79,7 +80,7 @@
 #define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1
 #define STM32_LPTIM2SEL                     STM32_LPTIM2SEL_PCLK1
 #define STM32_SAI1SEL                       STM32_SAI1SEL_OFF
-#define STM32_CLK48SEL                      STM32_CLK48SEL_PLLSAI1
+#define STM32_CLK48SEL                      STM32_CLK48SEL_PLLSAI1QCLK
 #define STM32_ADCSEL                        STM32_ADCSEL_SYSCLK
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI
 
diff --git a/testhal/STM32/multi/UART/cfg/stm32wb55rg_nucleo68/mcuconf.h b/testhal/STM32/multi/UART/cfg/stm32wb55rg_nucleo68/mcuconf.h
index a94526d99..28a7a77ac 100644
--- a/testhal/STM32/multi/UART/cfg/stm32wb55rg_nucleo68/mcuconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32wb55rg_nucleo68/mcuconf.h
@@ -43,8 +43,9 @@
 #define STM32_PLS                           STM32_PLS_LEV0
 #define STM32_HSI16_ENABLED                 TRUE
 #define STM32_HSI48_ENABLED                 FALSE
-#define STM32_LSI_ENABLED                   TRUE
-#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSI1_ENABLED                  TRUE
+#define STM32_LSI2_ENABLED                  FALSE
+#define STM32_HSE32_ENABLED                 TRUE
 #define STM32_LSE_ENABLED                   TRUE
 #define STM32_MSIPLL_ENABLED                TRUE
 #define STM32_MSIRANGE                      STM32_MSIRANGE_4M
@@ -79,7 +80,7 @@
 #define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1
 #define STM32_LPTIM2SEL                     STM32_LPTIM2SEL_PCLK1
 #define STM32_SAI1SEL                       STM32_SAI1SEL_OFF
-#define STM32_CLK48SEL                      STM32_CLK48SEL_PLLSAI1
+#define STM32_CLK48SEL                      STM32_CLK48SEL_PLLSAI1QCLK
 #define STM32_ADCSEL                        STM32_ADCSEL_SYSCLK
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI
 
diff --git a/tools/ftl/processors/boards/stm32wbxx/templates/board.h.ftl b/tools/ftl/processors/boards/stm32wbxx/templates/board.h.ftl
index c8b9fdfff..2987504b4 100644
--- a/tools/ftl/processors/boards/stm32wbxx/templates/board.h.ftl
+++ b/tools/ftl/processors/boards/stm32wbxx/templates/board.h.ftl
@@ -83,10 +83,6 @@
 [/#if]
 #define STM32_LSEDRV                (${doc1.board.clocks.@LSEDrive[0]?word_list[0]?number}U << 3U)
 
-#if !defined(STM32_HSECLK)
-#define STM32_HSECLK                ${doc1.board.clocks.@HSEFrequency[0]}U
-#endif
-
 /*
  * Board voltages.
  * Required for performance limits calculation.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32wb55xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32wb55xx/mcuconf.h.ftl
index 57798d0dd..8e306fe18 100644
--- a/tools/ftl/processors/conf/mcuconf_stm32wb55xx/mcuconf.h.ftl
+++ b/tools/ftl/processors/conf/mcuconf_stm32wb55xx/mcuconf.h.ftl
@@ -54,8 +54,8 @@
 #define STM32_PLS                           ${doc.STM32_PLS!"STM32_PLS_LEV0"}
 #define STM32_HSI16_ENABLED                 ${doc.STM32_HSI16_ENABLED!"TRUE"}
 #define STM32_HSI48_ENABLED                 ${doc.STM32_HSI48_ENABLED!"FALSE"}
-#define STM32_LSI1_ENABLED                  ${doc.STM32_LSI_ENABLED!"TRUE"}
-#define STM32_LSI2_ENABLED                  ${doc.STM32_LSI_ENABLED!"FALSE"}
+#define STM32_LSI1_ENABLED                  ${doc.STM32_LSI1_ENABLED!"TRUE"}
+#define STM32_LSI2_ENABLED                  ${doc.STM32_LSI2_ENABLED!"FALSE"}
 #define STM32_HSE32_ENABLED                 ${doc.STM32_HSE32_ENABLED!"FALSE"}
 #define STM32_LSE_ENABLED                   ${doc.STM32_LSE_ENABLED!"FALSE"}
 #define STM32_MSIPLL_ENABLED                ${doc.STM32_MSIPLL_ENABLED!"FALSE"}