diff --git a/utils/cgroupfs-mount/Makefile b/utils/cgroupfs-mount/Makefile
index ce021de8d3..03d1088a69 100644
--- a/utils/cgroupfs-mount/Makefile
+++ b/utils/cgroupfs-mount/Makefile
@@ -10,23 +10,13 @@ PKG_HASH:=d6c8aff7af59c7d0082ee3018c97f73b0421e81a49bb28ad9f66a36da5cd6ec7
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
 
-define Package/cgroupfs-mount/config
-config CGROUPFS_MOUNT_CGROUPS
-	depends on PACKAGE_cgroupfs-mount
-	bool "Enable support for cgroups in the kernel"
-	default y
-	select KERNEL_CGROUPS
-endef
-
 define Package/cgroupfs-mount
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=cgroup mount scripts
-  DEPENDS:=+mount-utils
+  DEPENDS:=@KERNEL_CGROUPS +mount-utils
   MENU:=1
 endef
 
diff --git a/utils/docker-ce/Config.in b/utils/docker-ce/Config.in
index 5c6428e74e..b67076efd7 100644
--- a/utils/docker-ce/Config.in
+++ b/utils/docker-ce/Config.in
@@ -1,4 +1,4 @@
-if PACKAGE_docker-ce
+menu "Kernel features for Docker"
 	config DOCKER_KERNEL_OPTIONS
 		bool "Enable Basic kernel support for Docker"
 		default n
@@ -9,7 +9,7 @@ if PACKAGE_docker-ce
 		select KERNEL_CPUSETS
 		select KERNEL_MEMCG
 		select KERNEL_KEYS
-		select KERNEL_LXC_MISC
+		select KERNEL_DEVPTS_MULTIPLE_INSTANCES
 		select KERNEL_POSIX_MQUEUE
 		help
 		  Select needed kernel options for Docker. Options include
@@ -81,4 +81,4 @@ if PACKAGE_docker-ce
 			select PACKAGE_kmod-fs-btrfs
 			select KERNEL_BTRFS_FS_POSIX_ACL
 	endmenu
-endif
+endmenu
diff --git a/utils/lxc/Config.in b/utils/lxc/Config.in
index b655d3e594..ff58ba0960 100644
--- a/utils/lxc/Config.in
+++ b/utils/lxc/Config.in
@@ -6,7 +6,8 @@ config LXC_KERNEL_OPTIONS
 	default n
 	select KERNEL_CGROUPS
 	select KERNEL_NAMESPACES
-	select KERNEL_LXC_MISC
+	select KERNEL_DEVPTS_MULTIPLE_INSTANCES
+	select KERNEL_POSIX_MQUEUE
 	select KERNEL_CGROUP_SCHED
 	select KERNEL_FAIR_GROUP_SCHED
 	select KERNEL_RT_GROUP_SCHED