diff --git a/arch/riscv/configs/32-bit.config b/arch/riscv/configs/32-bit.config
index 16ee163847b44..597dfa4756b3c 100644
--- a/arch/riscv/configs/32-bit.config
+++ b/arch/riscv/configs/32-bit.config
@@ -3,3 +3,4 @@ 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 18f9749dbf451..98d729242afb0 100644
--- a/arch/riscv/configs/64ilp32.config
+++ b/arch/riscv/configs/64ilp32.config
@@ -3,3 +3,4 @@ CONFIG_ARCH_RV64ILP32=y
 CONFIG_32BIT=y
 # CONFIG_PORTABLE is not set
 CONFIG_NONPORTABLE=y
+CONFIG_CGROUPS=n
diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
index 00e8cc9488d68..491589d4a4965 100644
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@ -251,11 +251,9 @@ CONFIG_TORTURE_TEST=m
 CONFIG_BLK_DEV_NBD=y
 CONFIG_FUSE_FS=y
 CONFIG_STRICT_KERNEL_RWX=n
-CONFIG_CGROUPS=n
 # Enable BPF_JIT & TEST_BPF
 CONFIG_BPF_JIT=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_TEST_BPF=m
 # TH1520
 CONFIG_PINCTRL_TH1520=y
-