diff --git a/modules/hal_gigadevice/CMakeLists.txt b/modules/hal_gigadevice/CMakeLists.txt
index 7a4096bc4d..3b887f654a 100644
--- a/modules/hal_gigadevice/CMakeLists.txt
+++ b/modules/hal_gigadevice/CMakeLists.txt
@@ -6,9 +6,9 @@ if(CONFIG_HAS_GD32_HAL)
 string(TOUPPER ${CONFIG_SOC} gd32_soc_uc)
 
 set(gd32_soc_dir     ${ZEPHYR_HAL_GIGADEVICE_MODULE_DIR}/${CONFIG_SOC_SERIES})
-if(CONFIG_SOC_FAMILY_GD32_ARM)
+if(CONFIG_ARM)
   set(gd32_soc_sys_dir   ${gd32_soc_dir}/cmsis/gd/${CONFIG_SOC_SERIES})
-elseif(CONFIG_SOC_SERIES_GD32VF103)
+elseif(CONFIG_RISCV)
   set(gd32_soc_sys_dir   ${gd32_soc_dir}/riscv)
   zephyr_include_directories(${gd32_soc_dir}/riscv/drivers)
 endif()
diff --git a/modules/hal_gigadevice/Kconfig b/modules/hal_gigadevice/Kconfig
index 66132779eb..84f6532b25 100644
--- a/modules/hal_gigadevice/Kconfig
+++ b/modules/hal_gigadevice/Kconfig
@@ -16,7 +16,7 @@ config GD32_HAS_AFIO_PINMUX
 
 config HAS_GD32_HAL
 	bool
-	select HAS_CMSIS_CORE if SOC_FAMILY_GD32_ARM
+	select HAS_CMSIS_CORE if ARM
 
 if HAS_GD32_HAL