diff --git a/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/metadata.xml
index c36c37139f..1e204dd6be 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/metadata.xml
@@ -1,8 +1,13 @@
 <?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="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/tmpfiles-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/tmpfiles-0-r1.ebuild
new file mode 100644
index 0000000000..ab126e516e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/tmpfiles-0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to select between different tmpfiles.d handlers"
+SLOT="0"
+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"
+
+RDEPEND="
+	!prefix-guest? (
+		|| (
+			sys-apps/systemd-tmpfiles
+			sys-apps/opentmpfiles
+			sys-apps/systemd
+		)
+	)"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/tmpfiles-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/tmpfiles-0.ebuild
deleted file mode 100644
index 20eb239fcc..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/tmpfiles/tmpfiles-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual to select between different tmpfiles.d handlers"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| (
-		sys-apps/opentmpfiles
-		sys-apps/systemd
-	)"