diff --git a/boards/arm/nucleo_f401re/Kconfig.defconfig b/boards/arm/nucleo_f401re/Kconfig.defconfig
index 62c5cd02cc3..a634aca6a73 100644
--- a/boards/arm/nucleo_f401re/Kconfig.defconfig
+++ b/boards/arm/nucleo_f401re/Kconfig.defconfig
@@ -13,14 +13,4 @@ config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
 
-if WATCHDOG
-
-config WWDG_STM32
-	default y
-
-config IWDG_STM32
-	default n
-
-endif # WATCHDOG
-
 endif # BOARD_NUCLEO_F401RE
diff --git a/boards/arm/nucleo_l496zg/Kconfig.defconfig b/boards/arm/nucleo_l496zg/Kconfig.defconfig
index a538550fa88..34fcc96575a 100644
--- a/boards/arm/nucleo_l496zg/Kconfig.defconfig
+++ b/boards/arm/nucleo_l496zg/Kconfig.defconfig
@@ -12,14 +12,4 @@ config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
 
-if WATCHDOG
-
-config WWDG_STM32
-	default y
-
-config IWDG_STM32
-	default n
-
-endif # WATCHDOG
-
 endif # BOARD_NUCLEO_L496ZG
diff --git a/drivers/watchdog/Kconfig.stm32 b/drivers/watchdog/Kconfig.stm32
index 14c53811d42..240714f1323 100644
--- a/drivers/watchdog/Kconfig.stm32
+++ b/drivers/watchdog/Kconfig.stm32
@@ -5,8 +5,12 @@
 # Copyright (c) 2019 Centaur Analytics, Inc
 # SPDX-License-Identifier: Apache-2.0
 
-menuconfig IWDG_STM32
+DT_COMPAT_ST_STM32_IWDG := st,stm32-watchdog
+DT_COMPAT_ST_STM32_WWDG := st,stm32-window-watchdog
+
+config IWDG_STM32
 	bool "Independent Watchdog (IWDG) Driver for STM32 family of MCUs"
+	default $(dt_compat_enabled,$(DT_COMPAT_ST_STM32_IWDG))
 	depends on SOC_FAMILY_STM32
 	help
 	  Enable IWDG driver for STM32 line of MCUs
@@ -29,6 +33,7 @@ config IWDG_STM32_INITIAL_TIMEOUT
 
 config WWDG_STM32
 	bool "System Window Watchdog (WWDG) Driver for STM32 family of MCUs"
+	default $(dt_compat_enabled,$(DT_COMPAT_ST_STM32_WWDG))
 	depends on SOC_FAMILY_STM32
 	help
 	  Enable WWDG driver for STM32 line of MCUs
diff --git a/soc/arm/st_stm32/common/Kconfig.defconfig.series b/soc/arm/st_stm32/common/Kconfig.defconfig.series
index 6d3035210e0..435fe00993f 100644
--- a/soc/arm/st_stm32/common/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/common/Kconfig.defconfig.series
@@ -36,16 +36,6 @@ config PINMUX_STM32
 	default y
 	depends on PINMUX
 
-if WATCHDOG
-
-config IWDG_STM32
-	default y
-
-config WWDG_STM32
-	default n
-
-endif # WATCHDOG
-
 config PWM_STM32
 	default y
 	depends on PWM