diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild
index 078672d88e..147c4652d5 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild
@@ -62,6 +62,7 @@ src_compile() {
 src_install() {
 	dobin bin/containerd{-shim,-shim-runc-v*,} bin/ctr
 	systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service"
+	systemd_enable_service multi-user.target "${PN}.service"
 	insinto /usr/share/containerd
 	doins "${FILESDIR}/config.toml"
 	doins "${FILESDIR}/config-cgroupfs.toml"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json
index 190f9e8538..418acbdcd9 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json
+++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json
@@ -23,7 +23,8 @@
             "/lib/systemd/system/containerd.service",
             "/lib/systemd/system/docker.service",
             "/lib/systemd/system/docker.socket",
-            "/lib/systemd/system/sockets.target.wants"
+            "/lib/systemd/system/sockets.target.wants",
+            "/lib/systemd/system/multi-user.target.wants"
         ]
     }
 }