diff --git a/drivers/clock_control/Kconfig.stm32g0 b/drivers/clock_control/Kconfig.stm32g0
index 6f75bad8bc3..20581f59c87 100644
--- a/drivers/clock_control/Kconfig.stm32g0
+++ b/drivers/clock_control/Kconfig.stm32g0
@@ -30,6 +30,15 @@ config CLOCK_STM32_PLL_P_DIVISOR
 	help
 	  PLL P VCO divisor, allowed values: 2-32.
 
+config CLOCK_STM32_PLL_Q_DIVISOR
+	int "PLL Q Divisor"
+	depends on CLOCK_STM32_SYSCLK_SRC_PLL && (SOC_STM32G031XX || SOC_STM32G071XX)
+	default 2
+	range 2 8
+	help
+	  PLL Q VCO divisor, allowed values: 2-8.
+	  Limited to STM32G0X1 variants.
+
 config CLOCK_STM32_PLL_R_DIVISOR
 	int "PLL R Divisor"
 	depends on CLOCK_STM32_SYSCLK_SRC_PLL
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx
index 444e374d69d..77022c3f740 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx
@@ -13,12 +13,4 @@ config NUM_IRQS
 	int
 	default 30
 
-config CLOCK_STM32_PLL_Q_DIVISOR
-	int "PLL Q Divisor"
-	depends on CLOCK_STM32_SYSCLK_SRC_PLL
-	default 2
-	range 2 8
-	help
-	  PLL Q VCO divisor, allowed values: 2-8.
-
 endif # SOC_STM32G031XX
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx
index dc5ee2bf5e5..cf000d61732 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx
@@ -12,12 +12,4 @@ config SOC
 config NUM_IRQS
 	default 32
 
-config CLOCK_STM32_PLL_Q_DIVISOR
-	int "PLL Q Divisor"
-	depends on CLOCK_STM32_SYSCLK_SRC_PLL
-	default 2
-	range 2 8
-	help
-	  PLL Q VCO divisor, allowed values: 2-8
-
 endif # SOC_STM32G071XX