diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
index 8f22ddb76e..0932adabc7 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
@@ -6,7 +6,7 @@
 #
 
 EAPI=2
-CROS_WORKON_PROJECT="xiangli-cmu/etcd-client"
+CROS_WORKON_PROJECT="coreos/etcd-client"
 CROS_WORKON_LOCALNAME="etcd-client"
 CROS_WORKON_REPO="git://github.com"
 inherit toolchain-funcs cros-workon systemd
@@ -26,10 +26,10 @@ GOPKG="${PN}"
 
 src_compile() {
 	export GOPATH="${S}"
-	go install "${PN}"
+	go get
+	go build -o ${PN} || die
 }
 
 src_install() {
-	dobin ${S}/etcd-client
+	dobin ${S}/${PN} || die
 }
-
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
index 7080eab12c..dca86b55c6 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
@@ -6,7 +6,7 @@
 #
 
 EAPI=2
-CROS_WORKON_PROJECT="xiangli-cmu/etcd"
+CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
 inherit toolchain-funcs cros-workon systemd
@@ -26,12 +26,12 @@ GOPKG="${PN}"
 
 src_compile() {
 	export GOPATH="${S}"
-	go install "${PN}"
+	go get
+	go build -o ${PN}
 }
 
 src_install() {
-	dosbin ${S}/etcd
+	dosbin ${S}/${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
 }
-