diff --git a/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a.dts b/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a.dts
index 2d9a3bd7acb..f6014f882dc 100644
--- a/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a.dts
+++ b/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a.dts
@@ -46,6 +46,27 @@
 	};
 };
 
+&clk_hsi {
+	status = "okay";
+};
+
+&pll {
+	div-m = <4>;
+	mul-n = <40>;
+	div-q = <2>;
+	div-r = <2>;
+	clocks = <&clk_hsi>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(80)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+};
+
 &usart1 {
 	pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pb7>;
 	current-speed = <115200>;
diff --git a/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig b/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig
index 9a5800df261..0dffee21efe 100644
--- a/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig
+++ b/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig
@@ -2,8 +2,6 @@
 
 CONFIG_SOC_SERIES_STM32L4X=y
 CONFIG_SOC_STM32L4S5XX=y
-# 80MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000
 
 # enable uart driver
 CONFIG_SERIAL=y
@@ -14,29 +12,8 @@ CONFIG_PINMUX=y
 # enable GPIO
 CONFIG_GPIO=y
 
-# clock configuration
+# Enable Clocks
 CONFIG_CLOCK_CONTROL=y
-# SYSCLK selection
-CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
-
-# Use HSI (16MHz) to feed into PLL
-CONFIG_CLOCK_STM32_PLL_SRC_HSI=y
-
-# PLL configuration
-CONFIG_CLOCK_STM32_PLL_M_DIVISOR=4
-CONFIG_CLOCK_STM32_PLL_P_DIVISOR=2
-CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=2
-CONFIG_CLOCK_STM32_PLL_R_DIVISOR=2
-
-# Produce 80MHz clock at PLLCLK output
-CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=40
-
-# Produce Max (80MHz) HCLK
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-
-# Produce Max (80MHz) APB1 clocks and APB2 clocks
-CONFIG_CLOCK_STM32_APB1_PRESCALER=1
-CONFIG_CLOCK_STM32_APB2_PRESCALER=1
 
 # console
 CONFIG_CONSOLE=y