diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts b/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts
index 8f11df7da01..9ad72d3e135 100644
--- a/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts
+++ b/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts
@@ -42,6 +42,28 @@
 	};
 };
 
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(12)>;
+	status = "okay";
+};
+
+&pll {
+	div-m = <6>;
+	mul-n = <168>;
+	div-p = <2>;
+	div-q = <7>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(168)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <4>;
+	apb2-prescaler = <2>;
+};
+
 &usart1 {
 	pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pb7>;
 	current-speed = <115200>;
diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
index 2c271f40edf..984563e2cd9 100644
--- a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
+++ b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
@@ -2,8 +2,6 @@
 
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F407XG=y
-# 168MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 
 # Enable MPU
 CONFIG_ARM_MPU=y
@@ -23,19 +21,5 @@ CONFIG_PINMUX=y
 # enable GPIO
 CONFIG_GPIO=y
 
-# clock configuration
+# Enable Clocks
 CONFIG_CLOCK_CONTROL=y
-
-# Clock configuration for Cube Clock control driver
-CONFIG_CLOCK_STM32_HSE_CLOCK=12000000
-CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
-# use HSE as PLL input
-CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
-# produce 168MHz clock at PLL output
-CONFIG_CLOCK_STM32_PLL_M_DIVISOR=6
-CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=168
-CONFIG_CLOCK_STM32_PLL_P_DIVISOR=2
-CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=7
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-CONFIG_CLOCK_STM32_APB1_PRESCALER=4
-CONFIG_CLOCK_STM32_APB2_PRESCALER=2