diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.5-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.5-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config-cgroupfs.toml b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config-cgroupfs.toml
index 436edaea13..e2b6806b14 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config-cgroupfs.toml
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config-cgroupfs.toml
@@ -1,3 +1,5 @@
+version = 2
+
 # persistent data location
 root = "/var/lib/containerd"
 # runtime state information
@@ -16,7 +18,7 @@ uid = 0
 # socket gid
 gid = 0
 
-[plugins.linux]
+[plugins."containerd.runtime.v1.linux"]
 # shim binary name/path
 shim = "containerd-shim"
 # runtime binary name/path
@@ -25,6 +27,8 @@ runtime = "runc"
 # live restore is not supported
 no_shim = false
 
-# config version 1; version 2 uses full plugin paths
-[plugins.cri.containerd.runtimes.runc.options]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+# setting runc.options unsets parent settings
+runtime_type = "io.containerd.runc.v2"
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
 SystemdCgroup = false
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml
index ebc9f2335f..b5459b93db 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml
@@ -1,3 +1,5 @@
+version = 2
+
 # persistent data location
 root = "/var/lib/containerd"
 # runtime state information
@@ -16,7 +18,7 @@ uid = 0
 # socket gid
 gid = 0
 
-[plugins.linux]
+[plugins."containerd.runtime.v1.linux"]
 # shim binary name/path
 shim = "containerd-shim"
 # runtime binary name/path
@@ -25,6 +27,8 @@ runtime = "runc"
 # live restore is not supported
 no_shim = false
 
-# config version 1; version 2 uses full plugin paths
-[plugins.cri.containerd.runtimes.runc.options]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+# setting runc.options unsets parent settings
+runtime_type = "io.containerd.runc.v2"
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
 SystemdCgroup = true