diff --git a/boards.txt b/boards.txt
index 989ede4a88..26869ca87b 100644
--- a/boards.txt
+++ b/boards.txt
@@ -473,6 +473,8 @@ Nucleo_64.menu.pnum.NUCLEO_C071RB.build.product_line=STM32C071xx
 Nucleo_64.menu.pnum.NUCLEO_C071RB.build.variant=STM32C0xx/C071R(8-B)T
 Nucleo_64.menu.pnum.NUCLEO_C071RB.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Nucleo_64.menu.pnum.NUCLEO_C071RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
+Nucleo_64.menu.pnum.NUCLEO_C071RB.openocd.target=stm32c0x
+Nucleo_64.menu.pnum.NUCLEO_C071RB.debug.server.openocd.scripts.1={runtime.platform.path}/debugger/select_dapdirect.cfg
 Nucleo_64.menu.pnum.NUCLEO_C071RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
 
 # NUCLEO_F030R8 board
@@ -829,6 +831,7 @@ Nucleo_64.menu.pnum.NUCLEO_U083RC.build.product_line=STM32U083xx
 Nucleo_64.menu.pnum.NUCLEO_U083RC.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
 Nucleo_64.menu.pnum.NUCLEO_U083RC.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
 Nucleo_64.menu.pnum.NUCLEO_U083RC.openocd.target=stm32u0x
+Nucleo_64.menu.pnum.NUCLEO_U083RC.debug.server.openocd.scripts.1={runtime.platform.path}/debugger/select_dapdirect.cfg
 Nucleo_64.menu.pnum.NUCLEO_U083RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
 
 # NUCLEO_WB15CC
diff --git a/debugger/select_dapdirect.cfg b/debugger/select_dapdirect.cfg
new file mode 100644
index 0000000000..b7a8b692c3
--- /dev/null
+++ b/debugger/select_dapdirect.cfg
@@ -0,0 +1 @@
+transport select dapdirect_swd
diff --git a/platform.txt b/platform.txt
index 3b687213d2..afb13c19a5 100644
--- a/platform.txt
+++ b/platform.txt
@@ -16,8 +16,8 @@ tool_suffix.windows=.exe
 busybox=
 busybox.windows={runtime.tools.STM32Tools.path}/win/busybox.exe
 
-toolchain_dir={runtime.tools.xpack-arm-none-eabi-gcc-13.2.1-1.1.path}
-openocd_dir={runtime.tools.xpack-openocd-0.12.0-4.path}
+toolchain_dir={runtime.tools.xpack-arm-none-eabi-gcc-14.2.1-1.1.path}
+openocd_dir={runtime.tools.xpack-openocd-0.12.0-5.path}
 
 tools_bin_path.windows={runtime.tools.STM32Tools.path}/win
 tools_bin_path.macosx={runtime.tools.STM32Tools.path}/macosx
diff --git a/variants/STM32C0xx/C011J(4-6)M/generic_clock.c b/variants/STM32C0xx/C011J(4-6)M/generic_clock.c
index 3252c3a51f..2d34f61d7c 100644
--- a/variants/STM32C0xx/C011J(4-6)M/generic_clock.c
+++ b/variants/STM32C0xx/C011J(4-6)M/generic_clock.c
@@ -12,6 +12,7 @@
  */
 #if defined(ARDUINO_GENERIC_C011J4MX) || defined(ARDUINO_GENERIC_C011J6MX)
 #include "pins_arduino.h"
+#include "stm32yyxx_ll_utils.h"
 
 /**
   * @brief  System Clock Configuration