diff --git a/boards/riscv/riscv32_virtual/riscv32_virtual_defconfig b/boards/riscv/riscv32_virtual/riscv32_virtual_defconfig
index a905f99da2e..4dcad0a7ea1 100644
--- a/boards/riscv/riscv32_virtual/riscv32_virtual_defconfig
+++ b/boards/riscv/riscv32_virtual/riscv32_virtual_defconfig
@@ -1,7 +1,6 @@
 # Copyright (c) 2023 Meta
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_RISCV32_VIRTUAL_RENODE=y
 CONFIG_SOC_RISCV32_VIRTUAL_RENODE=y
 CONFIG_BOARD_RISCV32_VIRTUAL=y
 CONFIG_CONSOLE=y
diff --git a/soc/riscv/riscv-privileged/renode_virt/CMakeLists.txt b/soc/riscv/renode_virt/CMakeLists.txt
similarity index 100%
rename from soc/riscv/riscv-privileged/renode_virt/CMakeLists.txt
rename to soc/riscv/renode_virt/CMakeLists.txt
diff --git a/soc/riscv/riscv-privileged/renode_virt/Kconfig.defconfig.series b/soc/riscv/renode_virt/Kconfig.defconfig
similarity index 86%
rename from soc/riscv/riscv-privileged/renode_virt/Kconfig.defconfig.series
rename to soc/riscv/renode_virt/Kconfig.defconfig
index 09adc3d00e8..89e226edbb1 100644
--- a/soc/riscv/riscv-privileged/renode_virt/Kconfig.defconfig.series
+++ b/soc/riscv/renode_virt/Kconfig.defconfig
@@ -1,9 +1,9 @@
 # Copyright (c) 2023 Meta
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_SERIES_RISCV32_VIRTUAL_RENODE
+if SOC_RISCV32_VIRTUAL_RENODE
 
-config SOC_SERIES
+config SOC
 	default "renode_virt"
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
@@ -45,4 +45,4 @@ config MAX_IRQ_PER_AGGREGATOR
 config NUM_IRQS
 	default 2058
 
-endif # SOC_SERIES_RISCV32_VIRTUAL_RENODE
+endif # SOC_RISCV32_VIRTUAL_RENODE
diff --git a/soc/riscv/riscv-privileged/renode_virt/Kconfig.soc b/soc/riscv/renode_virt/Kconfig.soc
similarity index 75%
rename from soc/riscv/riscv-privileged/renode_virt/Kconfig.soc
rename to soc/riscv/renode_virt/Kconfig.soc
index d123e797229..3e8af25099f 100644
--- a/soc/riscv/riscv-privileged/renode_virt/Kconfig.soc
+++ b/soc/riscv/renode_virt/Kconfig.soc
@@ -1,12 +1,11 @@
 # Copyright (c) 2023 Meta
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-	prompt "Renode RISCV32 Virtual system implementation"
-	depends on SOC_SERIES_RISCV32_VIRTUAL_RENODE
-
 config SOC_RISCV32_VIRTUAL_RENODE
 	bool "Renode RISCV32 Virtual system implementation"
+	select RISCV
+	select RISCV_PRIVILEGED
+	select RISCV_PRIVILEGED_STANDALONE
 	select ATOMIC_OPERATIONS_BUILTIN
 	select INCLUDE_RESET_VECTOR
 	select RISCV_ISA_RV32I
@@ -15,5 +14,3 @@ config SOC_RISCV32_VIRTUAL_RENODE
 	select RISCV_ISA_EXT_C
 	select RISCV_ISA_EXT_ZICSR
 	select RISCV_ISA_EXT_ZIFENCEI
-
-endchoice
diff --git a/soc/riscv/riscv-privileged/renode_virt/soc.h b/soc/riscv/renode_virt/soc.h
similarity index 100%
rename from soc/riscv/riscv-privileged/renode_virt/soc.h
rename to soc/riscv/renode_virt/soc.h
diff --git a/soc/riscv/riscv-privileged/renode_virt/Kconfig.series b/soc/riscv/riscv-privileged/renode_virt/Kconfig.series
deleted file mode 100644
index 22e27cf38b4..00000000000
--- a/soc/riscv/riscv-privileged/renode_virt/Kconfig.series
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2023 Meta
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_RISCV32_VIRTUAL_RENODE
-	bool "Renode RISC-V32 Virtual SoC implementation"
-	select RISCV
-	select SOC_FAMILY_RISCV_PRIVILEGED
-	help
-	  Enable support for Renode RISC-V Virtual