diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.4.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.5.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.4.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.5.0.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 f8f431fdb3..25e2c29bb0 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
@@ -11,7 +11,7 @@ inherit cros-workon systemd coreos-go
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="50a738cad386621c2dea788c1b7e07edd52eac0b" # v0.4.2
+	CROS_WORKON_COMMIT="309194c9cf0444bca1df6300ea165637740caf42" # v0.5.0
 	KEYWORDS="amd64 arm64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
index d6a24c91f9..53ec0e93a7 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="3841ea2e3c433a2f7862fc6388525e69050182ca"
+	CROS_WORKON_COMMIT="a04a5a0aa87d700e4725d6caf247e06d405bf9f3"
 	KEYWORDS="amd64 arm arm64 x86"
 fi