diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/Manifest b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/Manifest
new file mode 100644
index 0000000000..10fba833b2
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/Manifest
@@ -0,0 +1 @@
+DIST go-tspi-27182e3e7b1dfcfb398b5408a619abc4f652a38b.tar.gz 36280 BLAKE2B 4736f354834fe31212c8530e287bb0dd36f3bdb560e4501492c14204078ca411bb53d1578012bbe08a3c27f1c5f8d345d6364d2a1f51483dce6797ae54d3968c SHA512 06f05b0abfdcfd2572607d19903338167992d60197c156638daa4a593508e6203727d260d8140cff13f280bf89db0a29fd97837b17acf77ccf6a1c61ff696977
diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-9999.ebuild
index 766de08fe1..79a6f6e61b 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-9999.ebuild
@@ -1,19 +1,25 @@
-EAPI=7
+# Copyright 2025 The Flatcar Container Linux Maintainers
+# Distributed under the terms of the Apache License 2.0
 
-inherit coreos-go git-r3 systemd
+EAPI=8
+
+inherit coreos-go systemd
 COREOS_GO_PACKAGE="github.com/coreos/go-tspi"
 COREOS_GO_GO111MODULE="off"
-EGIT_REPO_URI="https://github.com/coreos/go-tspi.git"
 
-if [[ "${PV}" == 9999 ]]; then
-        KEYWORDS="~amd64 ~arm64"
+DESCRIPTION="Go bindings and support code for libtspi and TPM communication"
+HOMEPAGE="https://github.com/google/go-tspi"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/google/go-tspi.git"
+	inherit git-r3
 else
-        EGIT_COMMIT="27182e3e7b1dfcfb398b5408a619abc4f652a38b"
-        KEYWORDS="amd64 arm64"
+	EGIT_VERSION="27182e3e7b1dfcfb398b5408a619abc4f652a38b"
+	SRC_URI="https://github.com/google/go-tspi/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
+	KEYWORDS="amd64 arm64"
 fi
 
-IUSE=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -21,11 +27,11 @@ RDEPEND="app-crypt/trousers"
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	      go_build "${COREOS_GO_PACKAGE}/tpmd"
-      	      go_build "${COREOS_GO_PACKAGE}/tpmown"
+	go_build "${COREOS_GO_PACKAGE}"/tpmd
+	go_build "${COREOS_GO_PACKAGE}"/tpmown
 }
 
 src_install() {
-	dobin ${GOBIN}/*
+	dobin "${GOBIN}"/*
 	systemd_dounit "${FILESDIR}"/tpmd.service
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/metadata.xml
new file mode 100644
index 0000000000..33e0ebb784
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">google/go-tspi</remote-id>
+	</upstream>
+</pkgmetadata>