diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.12.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.12.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.12.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.12.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 cdda1812e3..8003584e21 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
@@ -8,6 +8,7 @@ CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/mantle"
 
 if [[ "${PV}" == 9999 ]]; then
+	COREOS_GO_MOD="vendor"
 	KEYWORDS="~amd64 ~arm64"
 else
 	CROS_WORKON_COMMIT="e7983fc86fae0b77e24611c6f96da3765dc81d1d" # v0.12.0
@@ -37,7 +38,7 @@ src_compile() {
 		go_build "${COREOS_GO_PACKAGE}/cmd/${cmd}"
 	done
 
-	for a in amd64 arm64; do
+	for a in amd64; do
 		mkdir -p "${GOBIN}/${a}"
 		CGO_ENABLED=0 GOBIN="${GOBIN}/${a}" GOARCH=${a} go_build "${COREOS_GO_PACKAGE}/cmd/kolet"
 	done
@@ -52,7 +53,7 @@ src_install() {
 		dobin "${GOBIN}"/"${cmd}"
 	done
 
-	for a in amd64 arm64; do
+	for a in amd64; do
 		exeinto /usr/lib/kola/${a}
 		doexe "${GOBIN}/${a}/kolet"
 	done
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0-r1
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0-r1
index a9fa581b28..e9d2bca265 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.12.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
 REQUIRED_USE=go_version_go1_12
 SLOT=0
 _eclasses_=coreos-go	de47c54270d854e6c918ca20926e8371	coreos-go-depend	688230059f31df4bd9277464f10a6fa5	coreos-go-utils	67004337b6f831adc5f1ff107ee2f157	cros-workon	4ad6e6491a1010ad7c875302b3be18ba	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6d5704c73f8009cf106c5643102668fd
+_md5_=c378690431e393e441a815a1fcb84c93
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
index 33ec9a0cd1..590eb5b106 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
@@ -10,4 +10,4 @@ RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
 REQUIRED_USE=go_version_go1_12
 SLOT=0
 _eclasses_=coreos-go	de47c54270d854e6c918ca20926e8371	coreos-go-depend	688230059f31df4bd9277464f10a6fa5	coreos-go-utils	67004337b6f831adc5f1ff107ee2f157	cros-workon	4ad6e6491a1010ad7c875302b3be18ba	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6d5704c73f8009cf106c5643102668fd
+_md5_=c378690431e393e441a815a1fcb84c93