diff --git a/boards/arm/mikroe_clicker_2/mikroe_clicker_2.dts b/boards/arm/mikroe_clicker_2/mikroe_clicker_2.dts
index 654807f0355..837adb0adb3 100644
--- a/boards/arm/mikroe_clicker_2/mikroe_clicker_2.dts
+++ b/boards/arm/mikroe_clicker_2/mikroe_clicker_2.dts
@@ -53,6 +53,28 @@
 	};
 };
 
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(25)>;
+	status = "okay";
+};
+
+&pll {
+	div-m = <25>;
+	mul-n = <336>;
+	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>;
+};
+
 &usart2 {
 	pinctrl-0 = <&usart2_tx_pd5 &usart2_rx_pd6>;
 	current-speed = <9600>;
diff --git a/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig b/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig
index e1929314179..83a35a4ba2b 100644
--- a/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig
+++ b/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig
@@ -1,8 +1,6 @@
 CONFIG_BOARD_MIKROE_CLICKER_2=y
 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
@@ -18,19 +16,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=25000000
-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=25
-CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=336
-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