diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/files/tpmd.service b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/files/tpmd.service
new file mode 100644
index 0000000000..20c3a7356e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/files/tpmd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TPM remote access daemon
+Requires=tcsd.service
+
+[Service]
+User=tss
+ExecStart=/bin/tpmd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1.ebuild
new file mode 120000
index 0000000000..b5bacefd3d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1.ebuild
@@ -0,0 +1 @@
+go-tspi-9999.ebuild
\ No newline at end of file
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
new file mode 100644
index 0000000000..8ba8d0f445
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-9999.ebuild
@@ -0,0 +1,31 @@
+EAPI=5
+
+inherit coreos-go eutils git-r3 systemd
+COREOS_GO_PACKAGE="github.com/coreos/go-tspi"
+EGIT_REPO_URI="git://github.com/coreos/go-tspi.git"
+
+if [[ "${PV}" == 9999 ]]; then
+        KEYWORDS="~amd64 ~arm64"
+else
+        EGIT_COMMIT="9c5928e0350d9829e4d144b461884a259a176dbc"
+        KEYWORDS="amd64 arm64"
+fi
+
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="app-crypt/trousers"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	      go_build "${COREOS_GO_PACKAGE}/tpmd"
+}
+
+src_install() {
+	dobin ${GOBIN}/*
+	systemd_dounit "${FILESDIR}"/tpmd.service
+	systemd_enable_service multi-user.target tpmd.service
+}