diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest
index 1a1849aabe1..f1beae3a1c5 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest
@@ -1 +1 @@
-DIST locksmith-a1cb1f901971165827d68188e9f60752c0e33c10.tar.gz 239087 BLAKE2B f37e5cfcdad269f10b5c6f6f37365719f3a86cbe70ecf1c207e0e88129671b5d122170299eed5829a0b18ff1edd3d3e3f452efca207e819d646a4538c1820706 SHA512 79fe435d3efdaca7fec442701338b9dcc50b261e65d9628a3a0b69001f6bfadf4b4bf85f52d6025d4c3b04283b870423f23318bd275030032a34f5d9a82d1389
+DIST locksmith-6ea5e7c73bb83cf6c013ff191cc0646e08cb3240.tar.gz 1230613 BLAKE2B bd4cac290f0634c3528c9b3c2da953fdd54f8b6fa5fe8b5013805e91d35f585bdc67c630685f705a31fc62a465ba9413b88d8100db851bb0a621c6d170f662b8 SHA512 dd621123897b9a78dbc2f9316ede4a966a3948ff6a825cf2d474f81459e180a6acfa6e4d9a4e29c6b882b80e1574eb12a15dfbf7dd0999c11384ab5a8f4c46cf
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0-r3.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 f5c187c09dc..b2fdc415734 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
@@ -1,10 +1,10 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
+# Can't use EAPI=9 - systemd.eclass does not support it yet.
 EAPI=8
 
-COREOS_GO_PACKAGE="github.com/flatcar/locksmith"
-inherit systemd coreos-go
+inherit systemd go-module
 
 DESCRIPTION="Reboot manager for the Flatcar update engine"
 HOMEPAGE="https://github.com/flatcar/locksmith"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/flatcar/locksmith.git"
 	inherit git-r3
 else
-	EGIT_VERSION="a1cb1f901971165827d68188e9f60752c0e33c10" # flatcar-master
+	EGIT_VERSION="6ea5e7c73bb83cf6c013ff191cc0646e08cb3240" # flatcar-master
 	SRC_URI="https://github.com/flatcar/locksmith/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
@@ -22,13 +22,15 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 
+BDEPEND=">=dev-lang/go-1.26.0"
+
 src_compile() {
-	COREOS_GO_MOD=vendor go_build "${COREOS_GO_PACKAGE}/locksmithctl"
+	go build -o bin/locksmithctl ./locksmithctl
 }
 
 src_install() {
-	dobin "${GOBIN}"/locksmithctl
-	dosym ../../../bin/locksmithctl /usr/lib/locksmith/locksmithd
+	dobin bin/locksmithctl
+	dosym -r /usr/bin/locksmithctl /usr/lib/locksmith/locksmithd
 
 	systemd_dounit systemd/locksmithd.service
 	systemd_enable_service multi-user.target locksmithd.service