diff --git a/boards/arm/96b_carbon/96b_carbon.dts b/boards/arm/96b_carbon/96b_carbon.dts
index a92bc85b727..c8fe3cdafcd 100644
--- a/boards/arm/96b_carbon/96b_carbon.dts
+++ b/boards/arm/96b_carbon/96b_carbon.dts
@@ -53,6 +53,28 @@
 	};
 };
 
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(16)>;
+	status = "okay";
+};
+
+&pll {
+	div-m = <16>;
+	mul-n = <336>;
+	div-p = <4>;
+	div-q = <7>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(84)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <2>;
+	apb2-prescaler = <1>;
+};
+
 &usart1 {
 	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
 	current-speed = <115200>;
diff --git a/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig
index af56ae0e386..ad3e793db82 100644
--- a/boards/arm/96b_carbon/96b_carbon_defconfig
+++ b/boards/arm/96b_carbon/96b_carbon_defconfig
@@ -3,9 +3,6 @@
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F401XE=y
 
-# 84MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -24,20 +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=16000000
-CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
-# use HSE as PLL input
-CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
-# CONFIG_CLOCK_STM32_HSE_BYPASS=y
-# produce 84MHz clock at PLL output
-CONFIG_CLOCK_STM32_PLL_M_DIVISOR=16
-CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=336
-CONFIG_CLOCK_STM32_PLL_P_DIVISOR=4
-CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=7
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-CONFIG_CLOCK_STM32_APB1_PRESCALER=2
-CONFIG_CLOCK_STM32_APB2_PRESCALER=1