diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
index 3f713ed4d1..24aa61104f 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=4
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 else
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
 inherit systemd
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild
index c52d4383fc..361987b958 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild
@@ -7,10 +7,10 @@ CROS_WORKON_LOCALNAME="toolbox"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 else
 	CROS_WORKON_COMMIT="fc4fed00e9d178ae2814493d1e6426a4ce74970c"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
 inherit cros-workon
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index f1c65c0344..b827f88fb2 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	CROS_WORKON_COMMIT="7c8fca2ddb58c8d2c4fb4df31c242886df7dd257" # v1.6.2
 	DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
 inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild
index b2e180793a..6c85bcb334 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://github.com/coreos/"
 SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="cros_host official"
 
 # Do not enable offical and SDK at the same time,
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild
index d89ad87ca1..890416784d 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://coreos.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="vm-testing"
 
 # The dependencies here are meant to capture "all the packages
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild
index f5dc858e90..66f958294f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-experimental/coreos-experimental-0.0.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://coreos.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index d581c083db..105b17ca11 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -8,10 +8,10 @@ CROS_WORKON_LOCALNAME="init"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	CROS_WORKON_COMMIT="af207c09eff3b8447d457c5e534a0b7ff3aae514"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 inherit cros-workon systemd
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index 7690a008ac..7a7e9f7ff4 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://coreos.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="etcd_protocols_1 etcd_protocols_2"
 
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild
index 4614151f0a..6eeedcd3ac 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild
@@ -8,10 +8,10 @@ CROS_WORKON_LOCALNAME="dev"
 CROS_WORKON_LOCALDIR="src/platform"
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	CROS_WORKON_COMMIT="66e206c20f22e002bbdaed1982b08b18a9b7f730"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 inherit cros-workon
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild
index 8dff1d9602..ffcbc8424e 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild
@@ -22,7 +22,7 @@ SRC_URI=""
 
 LICENSE="BSD"
 SLOT="${PV}"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="cros_host"
 
 RDEPEND="dev-libs/glib
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
index 9c1ed48941..9f4298b565 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND=""
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
index 10bcf4e1b8..0ca9323e90 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://libdivsufsort.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.12.ebuild
index b29c69776c..1de97c730a 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://libdnet.googlecode.com/files/${P}.tgz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 static-libs test"
 
 #DEPEND="test? ( dev-libs/check )"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.4_alpha.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.4_alpha.ebuild
index 87055705bc..385c44228a 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.4_alpha.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.4_alpha.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cabextract.org.uk/libmspack/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 IUSE="static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild
index a5302f49da..617b6c068e 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-util/bsdiff/bsdiff-4.3-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/libdivsufsort"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/repo/repo-1.21.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/repo/repo-1.21.ebuild
index 72640f4fb1..8abbc83a28 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/repo/repo-1.21.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/repo/repo-1.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild
index 4d02fba022..fcce68f861 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.chromium.org/"
 SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 arm"
+KEYWORDS="amd64 x86 arm arm64"
 IUSE=""
 
 src_compile() {
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild
index ba0668704f..a340e1ba39 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.chromium.org/"
 SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 IUSE=""
 
 src_compile() {
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild
index 75f306fe30..5bb2f690cf 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild
@@ -7,10 +7,10 @@ CROS_WORKON_REPO="git://github.com"
 AUTOTOOLS_AUTORECONF=1
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	CROS_WORKON_COMMIT="8881575d1372b860744afe57b52a153a03c80c6a"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 inherit autotools-utils cros-workon
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
index 2ccde23d0f..434cd3e583 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
@@ -8,10 +8,10 @@ CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	CROS_WORKON_COMMIT="2d74829987d0de4c6be2b4b194ed9fdedd50adc9"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 inherit cros-workon cros-debug cros-au
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild
index d7a94a0fe8..31b62622be 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 99999999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://gentoo/linux-firmware-${PV}.tar.xz"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
index 8bf273972a..2404643d6c 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
@@ -7,10 +7,10 @@ CROS_WORKON_LOCALNAME="nss-altfiles"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	CROS_WORKON_COMMIT="508d986e38c70bd0636740d287d2fe807822fb57" # v2.18.1
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 inherit cros-workon
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-0.0.1-r17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-0.0.1-r17.ebuild
index 83a7b669a8..ff29cda864 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-0.0.1-r17.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-0.0.1-r17.ebuild
@@ -16,7 +16,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-9999.ebuild
index 895411163f..6eb4dd8aae 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-process/ktop/ktop-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild
index ce708d5780..d8473fd1f6 100644
--- a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.coreos.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="cros_host"
 
 RDEPEND="