diff --git a/src/cmd/linuxkit/moby/config.go b/src/cmd/linuxkit/moby/config.go
index ead81f91e..414bba81f 100644
--- a/src/cmd/linuxkit/moby/config.go
+++ b/src/cmd/linuxkit/moby/config.go
@@ -875,7 +875,8 @@ func ConfigToOCI(yaml *Image, config imagespec.ImageConfig, idMap map[string]uin
 	// Always create a new mount namespace
 	namespaces = append(namespaces, specs.LinuxNamespace{Type: specs.MountNamespace})
 
-	// TODO cgroup namespaces
+	// Always create a new cgroup namespace
+	namespaces = append(namespaces, specs.LinuxNamespace{Type: specs.CgroupNamespace})
 
 	// Capabilities
 	capCheck := map[string]bool{}