diff --git a/arch/riscv/configs/32-bit.config b/arch/riscv/configs/32-bit.config
index 597dfa4756b3..16ee163847b4 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 98d729242afb..18f9749dbf45 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/defconfig b/arch/riscv/configs/defconfig
index 9e6dd2d8c785..ea3f68a28f4d 100644
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@ -250,3 +250,10 @@ CONFIG_BLK_DEV_NBD=y
 CONFIG_FUSE_FS=y
 CONFIG_STRICT_KERNEL_RWX=n
 CONFIG_STRICT_MODULE_RWX=n
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y