diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r275.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r276.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r275.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r276.ebuild
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 561e487038..85c038bd13 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
@@ -152,6 +152,7 @@ RDEPEND="${RDEPEND}
 	sys-apps/less
 	sys-apps/lshw
 	sys-apps/net-tools
+	sys-apps/nvme-cli
 	sys-apps/pciutils
 	sys-apps/rng-tools
 	sys-apps/sed
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
index a2eb0bcb8a..d021c2287f 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -108,3 +108,6 @@ dev-util/checkbashisms
 
 # perl 5.22.3-rc4 is stable and secure, but RCs break cross-compiling
 =dev-lang/perl-5.22.3 **
+
+# All versions are ~amd64 and not enabled on arm64
+=sys-apps/nvme-cli-1.1 **
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
index 46ded92fb7..c463072a0f 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
@@ -9,7 +9,7 @@ USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
 # Exclude documentation
 FEATURES="nodoc noinfo noman"
 
-# Exclude even more documentaiton
+# Exclude even more documentation
 # Remove bash-completion files as we don't install bash-completion.
 # Remove locale LC_MESSAGES files.
 INSTALL_MASK="${INSTALL_MASK}
@@ -22,6 +22,7 @@ INSTALL_MASK="${INSTALL_MASK}
 
 # Exclude assorted config files that we can do without
 INSTALL_MASK="${INSTALL_MASK}
+  /etc/bash_completion.d
   /etc/dmtab
   /etc/e2fsck.conf
   /etc/lvm/*