diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/Manifest
new file mode 100644
index 0000000000..cec1b06048
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/Manifest
@@ -0,0 +1 @@
+DIST nova-agent-watcher-f750d8e5e91a7e7e22e26c9d241d27b1b7563d70.tar.gz 217622 BLAKE2B 73c2975faba141cb5d259adf0f8ae8a9bbe7e89fd94e9a66577ad67798c5a740d2e25b8d826ee1241b3ebfb783df5ea42bf747bc5d6b12fe5f2624950d367e00 SHA512 0e684f95328c253734f9f5feac9340d403f4f50b5e87cc4a5eab95dde2a13a5eef9c967bbede7b315757063a9b2aef557a5370b489e0a781a072eec0c4b2e25c
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/metadata.xml
index 097975e3ad..0bdb255dd6 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/metadata.xml
@@ -1,4 +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">coreos/nova-agent-watcher</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild
index caf1b73e96..068ab472ff 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild
@@ -1,29 +1,30 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_REPO_URI="https://github.com/coreos/nova-agent-watcher.git"
+EAPI=8
+
 COREOS_GO_PACKAGE="github.com/coreos/nova-agent-watcher"
 COREOS_GO_GO111MODULE="off"
-inherit git-r3 systemd coreos-go
+inherit coreos-go
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64  ~arm64"
+DESCRIPTION="Watches for changes from Nova and reapplies them with coreos-cloudinit"
+HOMEPAGE="https://github.com/coreos/nova-agent-watcher"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/coreos/nova-agent-watcher.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="2262401fe363cfdcc4c6f02144622466d506de43"
+	EGIT_VERSION="f750d8e5e91a7e7e22e26c9d241d27b1b7563d70"
+	SRC_URI="https://github.com/coreos/nova-agent-watcher/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-DESCRIPTION="nova-agent-watcher"
-HOMEPAGE="https://github.com/coreos/nova-agent-watcher"
-SRC_URI=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 src_install() {
-	into "/oem"
-	dobin ${S}/scripts/gentoo-to-networkd
-	dobin ${GOBIN}/nova-agent-watcher
+	into /oem
+	dobin scripts/gentoo-to-networkd
+	dobin "${GOBIN}"/nova-agent-watcher
 }