diff --git a/arch/riscv/configs/32-bit.config b/arch/riscv/configs/32-bit.config
index 597dfa4756b3c..16ee163847b44 100644
--- a/arch/riscv/configs/32-bit.config
+++ b/arch/riscv/configs/32-bit.config
@@ -3,4 +3,3 @@ CONFIG_ARCH_RV32I=y
 CONFIG_32BIT=y
 # CONFIG_PORTABLE is not set
 CONFIG_NONPORTABLE=y
-CONFIG_CGROUPS=n
diff --git a/arch/riscv/configs/64ilp32.config b/arch/riscv/configs/64ilp32.config
index 98d729242afb0..18f9749dbf451 100644
--- a/arch/riscv/configs/64ilp32.config
+++ b/arch/riscv/configs/64ilp32.config
@@ -3,4 +3,3 @@ CONFIG_ARCH_RV64ILP32=y
 CONFIG_32BIT=y
 # CONFIG_PORTABLE is not set
 CONFIG_NONPORTABLE=y
-CONFIG_CGROUPS=n
diff --git a/arch/riscv/configs/k230_defconfig b/arch/riscv/configs/k230_defconfig
index 2040d2b2d0837..edddd5b833715 100644
--- a/arch/riscv/configs/k230_defconfig
+++ b/arch/riscv/configs/k230_defconfig
@@ -6,7 +6,8 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
+CONFIG_CGROUPS=n
+CONFIG_NONPORTABLE=y
 CONFIG_MEMCG=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y