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 713881d2fd..a5e475b4fc 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,2 +1,2 @@
-DIST containerd-0.2.3_p109.tar.gz 1036056 SHA256 8223d934fa767fcabf45c734bdb616818a5eab8c95d525de6a69a350f4aeb826 SHA512 96f8a6a5053018fc7889583481c1e24d5cfd8cb780bd76d7c09d299cac836f0842927aa6c5ff7ae8b3cded99b596fce64c7db18f9de6dc527eacc2202baa01dd WHIRLPOOL feac3f3f1f078b46a4ef794e287fee78a34a59b159295f9f5779733e93c6b315cedde658538644d33a41057392c34a44b7de08942c77a03c456c1aef24862fa7
 DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4
+DIST containerd-0.2.7_p2.tar.gz 1036065 SHA256 da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85 SHA512 b7d56adaac26c9f0fd0900467fb5f8500472b602d7ce2373704c08ae6a0b852051e469a4fa51c8db475499872a51fcdd65c2adc4124102e66b8ca86cc5b2ff2f WHIRLPOOL 98567c28df37dbe3ad9f926fdae35e5ceb2df50c90373e58b14b1b5204d6eb9763050acf90abd40b44791510809ba3390f91b61a77265db078a221055557a301
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p109.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.7_p2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p109.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.7_p2.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 18da0d36b6..b4f5d1f80e 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
@@ -16,8 +16,8 @@ else
 	# The patch number is arbitrarily chosen as the number of commits since the
 	# tagged version.
 	# e.g.  git log ${base_version}..${EGIT_COMMIT} --oneline | wc -l
-	# Note: 0.2.3 in the docker-1.13.x branch is not tagged, use 973f21f
-	EGIT_COMMIT="422e31ce907fd9c3833a38d7b8fdd023e5a76e73"
+	# Note: 0.2.3 in the v0.2.x branch is not tagged, use 973f21f
+	EGIT_COMMIT="9048e5e50717ea4497b757314bad98ea3763c145"
 	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-emulation/docker/docker-17.04.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.05.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.04.0-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.05.0.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index 1c690e9451..e75c063628 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	DOCKER_GITCOMMIT="unknown"
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="4845c567eb35d68f35b0b1713a09b0c8d47fe67e" # coreos-17.04.0-ce
+	CROS_WORKON_COMMIT="89658bed64c2a8fe05a978e5b87dbec409d57a0f" # coreos-17.05.0-ce
 	DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
 	KEYWORDS="amd64 arm64"
 fi
@@ -25,7 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="apparmor aufs +btrfs +container-init +device-mapper +overlay pkcs11 +journald seccomp +selinux vim-syntax zsh-completion"
 
-# https://github.com/docker/docker/blob/v17.04.0-ce/project/PACKAGERS.md#build-dependencies
+# https://github.com/docker/docker/blob/v17.05.0-ce/project/PACKAGERS.md#build-dependencies
 CDEPEND="
 	>=dev-db/sqlite-3.7.9:3
 	device-mapper? (
@@ -61,7 +61,7 @@ RDEPEND="
 	>=app-arch/xz-utils-4.9
 	>=sys-apps/shadow-4.4
 
-	=app-emulation/containerd-0.2.3_p109[seccomp?]
+	>=app-emulation/containerd-0.2.7_p2[seccomp?]
 	=app-emulation/runc-1.0.0_rc2_p137[apparmor?,seccomp?]
 	app-emulation/docker-proxy
 	container-init? ( >=sys-process/tini-0.13.1 )