diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
index 4e5282c10f..dec1444e42 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-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/fleet"
 CROS_WORKON_LOCALNAME="fleet"
 CROS_WORKON_REPO="git://github.com"
+COREOS_GO_PACKAGE="github.com/coreos/fleet"
+inherit coreos-doc cros-workon coreos-go systemd
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 else
 	CROS_WORKON_COMMIT="dc1d8e82dc07151297d8a2396dcf52e703d48f20"  # tag v0.10.1
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
-inherit coreos-doc cros-workon systemd
-
 DESCRIPTION="fleet"
 HOMEPAGE="https://github.com/coreos/fleet"
 SRC_URI=""
@@ -23,18 +23,15 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.3"
-
 src_compile() {
-	./build || die
+	go_build "${COREOS_GO_PACKAGE}/fleetd"
+	go_build "${COREOS_GO_PACKAGE}/fleetctl"
 }
 
 src_install() {
-	dobin ${S}/bin/fleetd
+	dobin ${GOBIN}/*
 	dosym ./fleetd /usr/bin/fleet
 
-	dobin ${S}/bin/fleetctl
-
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_dounit "${FILESDIR}"/${PN}.socket