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 18438f2489..6ad6c50bac 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 +1 @@
-DIST containerd-1.6.3.tar.gz 8624418 BLAKE2B 862205bd2fc67ae5bc4244aafe5d977907a9f7966cb72117cfe154625552eb4f373c49d23de5a010ca42546b683e475d32e2558e5dcbd10e246d535703a3561f SHA512 f8ba69e7e6e613496bd8c1cce8bd7ce26fb7e451c6b8792bb5ea1d5351b16763a6d8f5218741a9e618fd2c3df8b83537ac0c473e9cd3aed87cce8d0ac4e0b350
+DIST containerd-1.6.4.tar.gz 8625617 BLAKE2B b3766eec306a4e4b27849aa3131c0adf84e040c9b6b843bc2b231a13f5f1b6222035e4a7d2315170b0a001be60874544bbe2920bf4cda951aac48217efb3de28 SHA512 a913dbfdcf29faebd5617f64e7c5e62b366cb9c80d0dbf55337121601f3c5b7d19c1670f71e9454513b681a1568c7cd1fc28c5daf3ea1c820279f2a2356ff8c6
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.4.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 dcc5500f53..4d9d672f93 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="89d8b9fa02899ec4161923f53dc816a3f0f7398e"
+	CONTAINERD_COMMIT="d70576c25a27c158ebd1824babc8b009f47fe627"
 	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-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
index 23fbbccd8d..f907d87204 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
 RDEPEND="
 	~app-emulation/docker-20.10.14
 	~app-emulation/docker-cli-20.10.14
-	~app-emulation/containerd-1.6.3
+	~app-emulation/containerd-1.6.4
 	~app-emulation/docker-proxy-0.8.0_p20210525
 	~app-emulation/docker-runc-1.1.1
 	=dev-libs/libltdl-2.4.6
diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-06-containerd-1.6.4-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-06-containerd-1.6.4-update.md
new file mode 100644
index 0000000000..a1da98dcfc
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-06-containerd-1.6.4-update.md
@@ -0,0 +1 @@
+- containerd ([1.6.4](https://github.com/containerd/containerd/releases/tag/v1.6.4))