diff --git a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/Manifest b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/Manifest
index 65f68915c0..e5ae19ed07 100644
--- a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/Manifest
@@ -1,3 +1,2 @@
-DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f815ee4fbb750bf8b7d7110a69a808682c239a7c9196468ecc4d55a26eed3b63f8d8539569e16131060f57de389ef92e1063283eb2f41e65be00ed21bb1 SHA512 13d1fb8ff7c31100bfa481e647e9d3b90d61633173b3a71683246d7bb4b68c7e147d21697a17b7ad60e1ac8da2d48d6f4b51762370536a32d14da6c9a6db7e5e
-DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de
 DIST cifs-utils-6.15.tar.bz2 416592 BLAKE2B 8af926bf255c5b3a66bf52ccca99632aacb9ed1c83ad7db5543b32df2f3bcd4be9a9cd17b744ec115d1568d07084e2bd2d03849aa9ab97cff2862f39bcf137b8 SHA512 eedb8066563db584595a8ba7cb7a603e6b763ac2c1261430d605c327fcc5a831acd48b58ea55dd243af778dfdc827ab8c6daf4015764ff550dcffc2182773510
+DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774 SHA512 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb
diff --git a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild
index a40518d230..9e2054bc08 100644
--- a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
diff --git a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild
similarity index 86%
rename from sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild
index 49a473b376..a40518d230 100644
--- a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit autotools bash-completion-r1 linux-info multilib pam python-single-r1
+inherit autotools bash-completion-r1 linux-info pam python-single-r1
 
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils https://git.samba.org/cifs-utils.git/?p=cifs-utils.git"
 SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-kerberos_mount_regression_fix.patch.xz"
-
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
-	!net-fs/mount-cifs
-	sys-apps/keyutils:=
 	ads? (
+		sys-apps/keyutils:=
 		sys-libs/talloc
 		virtual/krb5
 	)
 	caps? ( sys-libs/libcap-ng )
-	pam? ( sys-libs/pam )
+	creds? ( sys-apps/keyutils:= )
+	pam? (
+		sys-apps/keyutils:=
+		sys-libs/pam
+	)
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
@@ -44,7 +45,7 @@ DOCS="doc/linux-cifs-client-guide.odt"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594
-	"${WORKDIR}/${P}-kerberos_mount_regression_fix.patch" #809023
+	"${FILESDIR}/${PN}-6.15-musl.patch"
 )
 
 pkg_setup() {