diff --git a/pkg/dom0-ztools/rootfs/etc/containerd/config.toml b/pkg/dom0-ztools/rootfs/etc/containerd/config.toml
index 0d7d6d1f7b..11bfc426dd 100644
--- a/pkg/dom0-ztools/rootfs/etc/containerd/config.toml
+++ b/pkg/dom0-ztools/rootfs/etc/containerd/config.toml
@@ -1,6 +1,12 @@
+version = 2
 state = "/run/containerd"
 root = "/persist/containerd-system-root"
-disabled_plugins = ["cri", "btrfs", "aufs"]
+disabled_plugins = [
+    "io.containerd.grpc.v1.cri",
+    "io.containerd.snapshotter.v1.btrfs",
+    "io.containerd.snapshotter.v1.aufs",
+    "io.containerd.internal.v1.opt"
+]
 
 [grpc]
   address = "/run/containerd/containerd.sock"
diff --git a/pkg/dom0-ztools/rootfs/usr/bin/containerd-shim b/pkg/dom0-ztools/rootfs/usr/bin/containerd-shim
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pkg/pillar/build-dev.yml b/pkg/pillar/build-dev.yml
index d55ff34bd3..c56af532fc 100644
--- a/pkg/pillar/build-dev.yml
+++ b/pkg/pillar/build-dev.yml
@@ -15,8 +15,6 @@ config:
     - /:/hostfs
     - /persist:/persist:rshared,rbind
     - /usr/bin/containerd:/usr/bin/containerd
-    - /usr/bin/containerd-shim:/usr/bin/containerd-shim
-    - /usr/bin/containerd-shim-runc-v2:/usr/bin/containerd-shim-runc-v2
   net: host
   capabilities:
     - all
diff --git a/pkg/pillar/build.yml b/pkg/pillar/build.yml
index 43d762441d..b3d86681ef 100644
--- a/pkg/pillar/build.yml
+++ b/pkg/pillar/build.yml
@@ -15,8 +15,6 @@ config:
     - /:/hostfs
     - /persist:/persist:rshared,rbind
     - /usr/bin/containerd:/usr/bin/containerd
-    - /usr/bin/containerd-shim:/usr/bin/containerd-shim
-    - /usr/bin/containerd-shim-runc-v2:/usr/bin/containerd-shim-runc-v2
   net: host
   capabilities:
     - all
diff --git a/pkg/pillar/containerd/containerd.go b/pkg/pillar/containerd/containerd.go
index 214c2c1679..a5183b88b0 100644
--- a/pkg/pillar/containerd/containerd.go
+++ b/pkg/pillar/containerd/containerd.go
@@ -51,7 +51,7 @@ const (
 	// ctrdServicesNamespace containerd namespace for running user containers
 	ctrdServicesNamespace = "eve-user-apps"
 	//containerdRunTime - default runtime of containerd
-	containerdRunTime = "io.containerd.runtime.v1.linux"
+	containerdRunTime = "io.containerd.runc.v2"
 	// container config file name
 	imageConfigFilename = "image-config.json"
 	// full OCI runtime spec
diff --git a/pkg/pillar/rootfs/etc/containerd/user.toml b/pkg/pillar/rootfs/etc/containerd/user.toml
index 8dbed079e9..b000815394 100644
--- a/pkg/pillar/rootfs/etc/containerd/user.toml
+++ b/pkg/pillar/rootfs/etc/containerd/user.toml
@@ -1,6 +1,20 @@
+version = 2
 state = "/run/containerd-user"
 root = "/persist/vault/containerd"
-disabled_plugins = ["cri", "btrfs", "aufs"]
+disabled_plugins = [
+    "io.containerd.grpc.v1.cri",
+    "io.containerd.snapshotter.v1.btrfs",
+    "io.containerd.snapshotter.v1.aufs",
+    "io.containerd.runtime.v1.linux",
+    "io.containerd.runtime.v2.task",
+    "io.containerd.service.v1.tasks-service",
+    "io.containerd.internal.v1.restart",
+    "io.containerd.grpc.v1.tasks",
+    "io.containerd.service.v1.containers-service",
+    "io.containerd.grpc.v1.containers",
+    "io.containerd.monitor.v1.cgroups",
+    "io.containerd.snapshotter.v1.native"
+]
 
 [grpc]
   address = "/run/containerd-user/containerd.sock"