diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest
index 923aa1edb7..6a06efbf66 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest
@@ -1,3 +1,3 @@
 DIST containerd-0.2.5.tar.gz 1003500 BLAKE2B ef08782b068e1d81df34881bdd156e7aa387d2710aee9b9c3b05a3d7cb018b7f78aab0aec77640823d8976636265e18ffc69abc25a4c326180b2c18c00059a4c SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f
 DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6
-DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a SHA512 b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
+DIST containerd-1.3.6.tar.gz 5703443 BLAKE2B f1efaad7c4942232ddb788c8241621ca1805c55b6bf4a3a4deb290c002a03cd707856623456597c60367ebb4471302d7abe270b855513ab41cb579a664e54f62 SHA512 2d40f925a724d87a8288060037622ba24be81df2734ba08418aa33534dac9265455e1c64244880b4de82074887cd5e19442da5abb6f1f32d1a5ad42c8f082d81
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.3.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.3.6.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.3.4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.3.6.ebuild
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 f245d07ec9..772da36f30 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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc.}"
 	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="6f917a232ad467b922f7cf1eeeb07007e3f9ba5d"
+	CONTAINERD_COMMIT="10dae48e3f1d19abf368873c87047e6d1581b204"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild
index a6cd895020..a198750afa 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64 arm64"
 # Explicitly list all packages that will be built into the image.
 RDEPEND="
 	~app-emulation/docker-19.03.12
-	~app-emulation/containerd-1.3.4
+	~app-emulation/containerd-1.3.6
 	~app-emulation/docker-proxy-0.8.0_p20180709
 	~app-emulation/docker-runc-1.0.0_rc90
 	=dev-libs/libltdl-2.4.6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.3.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.3.6
similarity index 89%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.3.4
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.3.6
index d54f66021f..da634e268c 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.3.4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.3.6
@@ -10,6 +10,6 @@ RDEPEND=~app-emulation/docker-runc-1.0.0_rc90 sys-libs/libseccomp
 REQUIRED_USE=go_version_go1_13
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/v1.3.4.tar.gz -> containerd-1.3.4.tar.gz
+SRC_URI=https://github.com/containerd/containerd/archive/v1.3.6.tar.gz -> containerd-1.3.6.tar.gz
 _eclasses_=coreos-go	95797abfe5c87b4e2eccc42269b4cee7	coreos-go-depend	90f5716bc80a5aea57dbb393aa0cabdf	coreos-go-utils	67004337b6f831adc5f1ff107ee2f157	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=34c33374623522668b38c98c77e6bddc
+_md5_=e20dd14b21c6efd22c88a60d92daf6ec
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999
index d9ff3f8c9c..81799b33e8 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=go_version_go1_13
 RESTRICT=test
 SLOT=0
 _eclasses_=coreos-go	95797abfe5c87b4e2eccc42269b4cee7	coreos-go-depend	90f5716bc80a5aea57dbb393aa0cabdf	coreos-go-utils	67004337b6f831adc5f1ff107ee2f157	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34c33374623522668b38c98c77e6bddc
+_md5_=e20dd14b21c6efd22c88a60d92daf6ec
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-19.03 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-19.03
index 45b07f6cee..26e3084429 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-19.03
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-19.03
@@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker
 EAPI=2
 KEYWORDS=amd64 arm64
 LICENSE=GPL-2
-RDEPEND=~app-emulation/docker-19.03.12 ~app-emulation/containerd-1.3.4 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc90 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0
+RDEPEND=~app-emulation/docker-19.03.12 ~app-emulation/containerd-1.3.6 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc90 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0
 SLOT=0
-_md5_=2fae9b959ded4db45a6075258e9dbfe1
+_md5_=8dbd36658cc41561bc138ef3ca508b97