diff --git a/soc/riscv32/openisa_rv32m1/Kconfig.defconfig b/soc/riscv32/openisa_rv32m1/Kconfig.defconfig
index 7f85641cc5a..7436f6feaca 100644
--- a/soc/riscv32/openisa_rv32m1/Kconfig.defconfig
+++ b/soc/riscv32/openisa_rv32m1/Kconfig.defconfig
@@ -29,6 +29,7 @@ config XIP
 
 config RISCV_GENERIC_TOOLCHAIN
 	bool
+	default y if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
 	default n
 
 config RISCV_SOC_CONTEXT_SAVE