diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild
index f3881edb1a..e14aef93ec 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
 	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2-r1.ebuild
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2-r1.ebuild
index c226bd8136..069c7557fe 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2-r1.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
 	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild
index c226bd8136..77fa14500b 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
 	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
@@ -103,7 +104,7 @@ python_prepare_all() {
 			die "failed to patch create_depgraph_params.py"
 
 		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \
 			>> cnf/make.globals || die
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild
index fb5130b948..d25ac103a8 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
 	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
@@ -96,7 +97,7 @@ python_prepare_all() {
 			die "failed to patch create_depgraph_params.py"
 
 		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \
 			>> cnf/make.globals || die
 	fi