diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/Manifest b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/Manifest
index 9eb28d6dd1..07d8e0fab9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/Manifest
@@ -1,4 +1,2 @@
-DIST efibootmgr-14.tar.bz2 34972 BLAKE2B 78490756c5fd449f4319b79e0818e9d80340bd487f57d0de34f79f48cc24eb7b9c7309b535d00efad4babd40904d4cfb085cca278170625a1e875961e423f5dd SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf
-DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7aa3224049e88cdafe82991799b1b719ec68c80131027f70c16bd19e38157f5d0bc7761843959410c667aa4070 SHA512 d9d9eef14d373d5da88141e8105f754fea4c039755ed0a0cb9b3c9c2bb285733ad930fd912df42075fe2cf750585699307b067f594d8e65269b3b8a5a00b1cd1
-DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
 DIST efibootmgr-17.tar.gz 41643 BLAKE2B a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9 SHA512 10c7ad9a79f23dcd4708dc4f42701196af7aa11f5e9a6468ea51f7013d4caeba6c92527ba1304f6e3b2ef3b51b3b69ea1a30f81bb099a8aea49eeb30eb631e1d
+DIST efibootmgr-18.tar.gz 45220 BLAKE2B 6bc3f39ee395d2045e78b19876fd9404ba41443259e9ad7446671d768a63dc1418d5a192600392fd95251159d80479008a2c22b4cd503bba2f4a869850cb3652 SHA512 04e40a705cb82440fd823043b598ef9fd1acc2ceda3e8d043a93e49d43ea9481b7386cad0f46de9862beff19b8a5480d79e7d6522ae584aff6655472f967764d
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-14.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-14.ebuild
deleted file mode 100644
index 8266a96d68..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="User-space application to modify the EFI boot manager"
-HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
-SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils
-	>=sys-libs/efivar-25:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// Make.defaults || die
-}
-
-src_configure() {
-	tc-export CC
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-15.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-15.ebuild
deleted file mode 100644
index b51f8d148d..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="User-space application to modify the EFI boot manager"
-HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
-SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils
-	>=sys-libs/efivar-25:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// Make.defaults || die
-}
-
-src_configure() {
-	tc-export CC
-	export EFIDIR="Gentoo"
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-17.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-17-r1.ebuild
similarity index 87%
rename from sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-17.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-17-r1.ebuild
index 4443462a56..4867892f28 100644
--- a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-17.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,9 +11,10 @@ SRC_URI="https://github.com/rhboot/efibootmgr/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~riscv x86"
 
 RDEPEND="
+	dev-libs/popt
 	sys-apps/pciutils
 	>=sys-libs/efivar-37:=
 "
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-18-r1.ebuild
similarity index 53%
rename from sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-16.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-18-r1.ebuild
index d16655fc90..05dc26fb19 100644
--- a/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/efibootmgr/efibootmgr-18-r1.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="User-space application to modify the EFI boot manager"
 HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
-SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rhboot/efibootmgr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~riscv x86"
 
-RDEPEND="sys-apps/pciutils
-	>=sys-libs/efivar-25:="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
+RDEPEND="
+	dev-libs/popt
+	sys-apps/pciutils
+	>=sys-libs/efivar-37:=
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
-	sed -i -e 's/-Werror //' Make.defaults || die
+	sed -i 's/-Werror //' Make.defaults || die
 }
 
 src_configure() {