diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use
index d71d119c57..9865e0391a 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use
@@ -4,3 +4,6 @@ sys-firmware/intel-microcode vanilla
 
 # Enable gssapi only for amd64, to avoid build errors in arm64.
 net-dns/bind-tools           gssapi
+
+# Disable crypt to avoid installing libsodlium in amd64.
+app-editors/vim		-crypt
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use
new file mode 100644
index 0000000000..3cad22ee54
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use
@@ -0,0 +1,2 @@
+# Disable crypt to avoid installing libsodlium in arm64.
+app-editors/vim		-crypt
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 84c28ff53b..a76a1beab9 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
@@ -4,11 +4,6 @@
 
 =app-arch/zstd-1.4.9 ~amd64 ~arm64
 
-# To address security issues like CVE-2021-3770, we need to acccept
-# keywords for vim 8.2.3428.
-=app-editors/vim-8.2.3428 ~amd64 ~arm64
-=app-editors/vim-core-8.2.3428 ~amd64 ~arm64
-
 =coreos-devel/fero-client-0.1.1 **
 
 # Accept unstable host Rust compilers