diff --git a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest
index 1fed1134a7..c03364a6ff 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest
@@ -1 +1 @@
-DIST eselect-go-0.1.0.tar.gz 104232 SHA256 541de8bc7b77d93f070f907f17760bb30dc3fa8244216d565fcdfb58ab04381b SHA512 b7e9bf07bc7026115d639ed893c54332d63cd2d7a46a6f3b2f8a6748658dfb82f09e875def8bf9abecfb1e39f054ef194b39b0c415ac9ce69ea03332125d4c1f WHIRLPOOL 77996759041eea27f169eadab48f122e55ec11886e851d583ebdd0cf667500d7ca45a62a9edfb99400cc69cbd936887ddface15e7c81d2b301ba111c53123a6a
+DIST eselect-go-0.1.0.tar.gz 104232 BLAKE2B 770773f990509bdfcdb1c463f01915526358fe28b440be288dad0833a4e8647cf52ba136569b4e7b46c71b80c6ffd43075fd25bfb516ec5790f80067247e08c5 SHA512 b7e9bf07bc7026115d639ed893c54332d63cd2d7a46a6f3b2f8a6748658dfb82f09e875def8bf9abecfb1e39f054ef194b39b0c415ac9ce69ea03332125d4c1f
diff --git a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0-r1.ebuild
similarity index 86%
rename from sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0-r1.ebuild
index b2478f5963..d7bb345d5e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 2016 CoreOS, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Eselect module for managing multiple Go versions"
 HOMEPAGE="https://github.com/coreos/eselect-go"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/coreos/eselect-go/releases/download/v${PV}/${P}.tar.gz"
 # Note for future releases: the tarball was generated via `make dist` and
 # uploaded to GitHub so there is no need for initializing autotools here.
 
@@ -14,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-libs/glib )"
 RDEPEND="app-admin/eselect
diff --git a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml
index 5b46f1713c..8fc934b3a9 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml
@@ -6,4 +6,7 @@
 		packages or architectures that cannot upgrade to the same Go version
 		all at the same time. Gentoo doesn't support this use case.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coreos/eselect-go</remote-id>
+	</upstream>
 </pkgmetadata>