diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
index 7510d7f041..f99a5e0881 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
@@ -6,7 +6,7 @@ CROS_WORKON_PROJECT="coreos/coreos-metadata"
 CROS_WORKON_LOCALNAME="coreos-metadata"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/coreos-metadata"
-inherit cros-workon systemd
+inherit coreos-go cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
@@ -24,6 +24,6 @@ SLOT="0"
 IUSE=""
 
 src_install() {
-	dobin "${S}/bin/${PN}"
+	dobin "${GOBIN}/${PN}"
 	systemd_dounit "${FILESDIR}/coreos-metadata.service"
 }