diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index c81c3bd3bf..0d417895c6 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -44,8 +44,8 @@ config ARCH_CHIP_BL602
 	select ARCH_RV32
 	select ARCH_RV_ISA_M
 	select ARCH_RV_ISA_A
-	select ARCH_RV_ISA_F
 	select ARCH_RV_ISA_C
+	select ARCH_HAVE_FPU
 	select ARCH_HAVE_RESET
 	---help---
 		BouffaloLab BL602(rv32imfc)
@@ -80,9 +80,9 @@ config ARCH_CHIP_C906
 	select ARCH_RV64
 	select ARCH_RV_ISA_M
 	select ARCH_RV_ISA_A
-	select ARCH_RV_ISA_F
-	select ARCH_RV_ISA_D
 	select ARCH_RV_ISA_C
+	select ARCH_HAVE_FPU
+	select ARCH_HAVE_DPFPU
 	select ARCH_HAVE_MPU
 	---help---
 		THEAD C906 processor (RISC-V 64bit core with GCVX extensions).
@@ -92,9 +92,9 @@ config ARCH_CHIP_MPFS
 	select ARCH_RV64
 	select ARCH_RV_ISA_M
 	select ARCH_RV_ISA_A
-	select ARCH_RV_ISA_F
-	select ARCH_RV_ISA_D
 	select ARCH_RV_ISA_C
+	select ARCH_HAVE_FPU
+	select ARCH_HAVE_DPFPU
 	select ARCH_HAVE_MPU
 	select ARCH_HAVE_RESET
 	select ARCH_HAVE_SPI_CS_CONTROL
@@ -112,8 +112,8 @@ config ARCH_CHIP_RV32M1
 
 config ARCH_CHIP_QEMU_RV
 	bool "QEMU RV"
-	select ARCH_RV_ISA_F
-	select ARCH_RV_ISA_D
+	select ARCH_HAVE_FPU
+	select ARCH_HAVE_DPFPU
 	---help---
 		QEMU Generic RV32 processor
 
@@ -149,17 +149,6 @@ config ARCH_RV_ISA_C
 	bool
 	default n
 
-config ARCH_RV_ISA_F
-	bool
-	default n
-	select ARCH_HAVE_FPU
-
-config ARCH_RV_ISA_D
-	bool
-	default n
-	depends on ARCH_RV_ISA_F
-	select ARCH_HAVE_DPFPU
-
 config ARCH_FAMILY
 	string
 	default "rv32"		if ARCH_RV32
diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index 11f10b15ef..c194f0efd9 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -81,14 +81,10 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
     ARCHRVISAC = c
   endif
 
-  # ARCH_FPU depends on ARCH_RV_ISA_F
-
   ifeq ($(CONFIG_ARCH_FPU),y)
       ARCHRVISAF = f
   endif
 
-  # ARCH_DPFPU depends on ARCH_RV_ISA_D and ARCH_FPU
-
   ifeq ($(CONFIG_ARCH_DPFPU),y)
       ARCHRVISAD = d
   endif
diff --git a/arch/risc-v/src/qemu-rv/Kconfig b/arch/risc-v/src/qemu-rv/Kconfig
index 337c78379b..21e11f40f8 100644
--- a/arch/risc-v/src/qemu-rv/Kconfig
+++ b/arch/risc-v/src/qemu-rv/Kconfig
@@ -22,17 +22,17 @@ endchoice
 
 config ARCH_CHIP_QEMU_RV_ISA_M
     bool "Standard Extension for Integer Multiplication and Division"
-    default y
+    default n
     select ARCH_RV_ISA_M
 
 config ARCH_CHIP_QEMU_RV_ISA_A
     bool "Standard Extension for Atomic Instructions"
-    default y
+    default n
     select ARCH_RV_ISA_A
 
 config ARCH_CHIP_QEMU_RV_ISA_C
     bool "Standard Extension for Compressed Instructions"
-    default y
+    default n
     select ARCH_RV_ISA_C
 
 endif