diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild
new file mode 100644
index 0000000000..2c8f799a6c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libcrypt.so"
+
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	!prefix-guest? (
+		elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] )
+		elibc_musl? ( sys-libs/musl )
+	)
+	elibc_Cygwin? ( sys-libs/cygwin-crypt )
+"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1.ebuild
deleted file mode 100644
index 2059e2651f..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for libcrypt.so"
-
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+static-libs"
-
-RDEPEND="
-	elibc_glibc? (
-		|| (
-			>=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?]
-			<sys-libs/glibc-2.30-r2
-		)
-	)
-	elibc_musl? ( sys-libs/musl )
-	elibc_uclibc? ( sys-libs/uclibc-ng )
-	elibc_Cygwin? ( sys-libs/cygwin-crypt )
-"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild
index 2cf11b679c..968fec179c 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,13 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
 
 RDEPEND="
-	elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,${MULTILIB_USEDEP}] )
-	elibc_musl? ( sys-libs/musl )
-	elibc_uclibc? ( sys-libs/uclibc-ng )
+	!prefix-guest? (
+		elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,${MULTILIB_USEDEP}] )
+		elibc_musl? ( sys-libs/musl )
+	)
 	elibc_Cygwin? ( sys-libs/cygwin-crypt )
 "
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/metadata.xml
index 82cfb159fc..d65b2dff50 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo base-system Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>