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
index 20c3a7356e..edf5c70aed 100644
--- 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
@@ -3,8 +3,9 @@ Description=TPM remote access daemon
 Requires=tcsd.service
 
 [Service]
-User=tss
-ExecStart=/bin/tpmd
+ExecStart=/bin/tpmd 23179
+Restart=always
+RestartSec=0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r4.ebuild
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 e86b5ae454..27888c2b06 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
@@ -7,7 +7,7 @@ EGIT_REPO_URI="git://github.com/coreos/go-tspi.git"
 if [[ "${PV}" == 9999 ]]; then
         KEYWORDS="~amd64 ~arm64"
 else
-        EGIT_COMMIT="1708d740a1fec08db39d9c15960ed6cc3a7e974a"
+        EGIT_COMMIT="27182e3e7b1dfcfb398b5408a619abc4f652a38b"
         KEYWORDS="amd64 arm64"
 fi
 
@@ -21,10 +21,10 @@ DEPEND="${RDEPEND}"
 
 src_compile() {
 	      go_build "${COREOS_GO_PACKAGE}/tpmd"
+      	      go_build "${COREOS_GO_PACKAGE}/tpmown"
 }
 
 src_install() {
 	dobin ${GOBIN}/*
 	systemd_dounit "${FILESDIR}"/tpmd.service
-	systemd_enable_service multi-user.target tpmd.service
 }