diff --git a/changelog/updates/2023-05-11-containerd-1.6.21-update.md b/changelog/updates/2023-05-11-containerd-1.6.21-update.md
new file mode 100644
index 0000000000..1ee9642049
--- /dev/null
+++ b/changelog/updates/2023-05-11-containerd-1.6.21-update.md
@@ -0,0 +1 @@
+- containerd ([1.6.21](https://github.com/containerd/containerd/releases/tag/v1.6.21))
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 948c86b097..6245a9e230 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.20.tar.gz 8749093 BLAKE2B b2168f68ba45f5e0c589946fdfcded8c57801340e10f4fe6374ab9caaa740888246df49322b880a06bd665ad98bbafc8c39d44059a00f446c7cc24bbdb357eb8 SHA512 dd9708c99d95773a78b0fcd77b388cb8a971d0d65502c8b86cbb3b29c48bac31366ae0603d7710a13c21c33adcd341cdec69dcb3c3a06a2d753c4c59f2549d75
+DIST containerd-1.6.21.tar.gz 8750934 BLAKE2B d4b0fffa628d9ec3167ebd776176d3a5884baf2f2b18add7610d8223bed4e98e5870cd4e34da7182e60c44a8fde3dfa397d3290b59384c97d276b5cb29a85b23 SHA512 a94ed8b8b9e153c9dc370228b659fcba1b03b3c47c8b5fcb001bb1b4b158ea048159f5d8d8c5294e7da3444edd76fbd903d7b7faa84e3382807a583d757325e1
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.20.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.21.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.20.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.21.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 56b03b9407..59c38bdd4a 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="0b7d72e9a8d8b1b7694cca5b6c0fc6dccf9c4d71"
+	CONTAINERD_COMMIT="66c1fbccbaaac631b77184b7957e67fea4cf45ab"
 	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 b7115ece6b..a4ac2f4f6a 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.24
 	~app-emulation/docker-cli-20.10.24
-	~app-emulation/containerd-1.6.20
+	~app-emulation/containerd-1.6.21
 	~app-emulation/docker-proxy-0.8.0_p20210525
 	~app-emulation/docker-runc-1.1.7
 	~dev-libs/libltdl-2.4.7