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