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 5beba2518d..d71d119c57 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,9 +4,3 @@ sys-firmware/intel-microcode vanilla
 
 # Enable gssapi only for amd64, to avoid build errors in arm64.
 net-dns/bind-tools           gssapi
-
-# -crypt: Disable crypt to avoid installing libsodlium in amd64.
-app-editors/vim		-crypt
-
-# minimal: Don't pull app-vim/gentoo-syntax in amd64
-app-editors/vim-core		minimal
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
deleted file mode 100644
index 82e4dbbe81..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# Disable crypt to avoid installing libsodlium in arm64.
-app-editors/vim		-crypt
-
-# minimal: Don't pull app-vim/gentoo-syntax in arm64
-app-editors/vim-core		minimal
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use
index c675c12b17..2a3cb5156b 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 app-admin/sudo		ldap sssd
-app-editors/vim		minimal
+# -crypt: Disable crypt to avoid installing libsodlium.
+app-editors/vim		minimal -crypt
+# minimal: Don't pull app-vim/gentoo-syntax
+app-editors/vim-core	minimal
 dev-lang/python		gdbm
 dev-libs/dbus-glib	tools
 dev-libs/elfutils	-utils