diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.4.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.4.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.4.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild
index 4af18dda87..08c0528e0f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild
@@ -6,6 +6,7 @@ CROS_WORKON_PROJECT="coreos/mantle"
 CROS_WORKON_LOCALNAME="mantle"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/mantle"
+COREOS_GO_VERSION="go1.8"
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"