diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r4.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
index 32c6e30723..bd798247a7 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
 else
-	CROS_WORKON_COMMIT="6e01218645bf40a7ebcad92c4c4ecf6adddb0878"
+	CROS_WORKON_COMMIT="47caf7bb9fdbece7f07afdc1eaff860816ea2f3a"
 	KEYWORDS="amd64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.5.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.6.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.5.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.6.0.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index b65c9b3fa6..464c035d0b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
 else
-	CROS_WORKON_COMMIT="0f1717bf26800eb240a16d02a9cabd64e60b4148" # v0.5.2
+	CROS_WORKON_COMMIT="7df5cf761e06033cd42eade4ec6c0902f9598965" # v0.6.0
 	KEYWORDS="amd64"
 fi