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 7d84c96fa9..b16d2d7028 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,20 +1,20 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
 CROS_WORKON_PROJECT="coreos/nova-agent-watcher"
 CROS_WORKON_LOCALNAME="nova-agent-watcher"
 CROS_WORKON_REPO="git://github.com"
+COREOS_GO_PACKAGE="github.com/coreos/nova-agent-watcher"
+inherit cros-workon systemd coreos-go
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64  ~arm64"
 else
 	CROS_WORKON_COMMIT="2262401fe363cfdcc4c6f02144622466d506de43"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
-inherit cros-workon systemd
-
 DESCRIPTION="nova-agent-watcher"
 HOMEPAGE="https://github.com/coreos/nova-agent-watcher"
 SRC_URI=""
@@ -23,14 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.2"
-
-src_compile() {
-	./build || die
-}
-
 src_install() {
 	into "/usr/share/oem"
 	dobin ${S}/scripts/gentoo-to-networkd
-	dobin ${S}/bin/nova-agent-watcher
+	dobin ${GOBIN}/nova-agent-watcher
 }