diff --git a/sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/dnsmasq-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/dnsmasq-0.ebuild
rename to sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/metadata.xml
index cee379b154..bd6443d4a3 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/dnsmasq/metadata.xml
@@ -1,5 +1,5 @@
 <?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>chutzpah@gentoo.org</email>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/messagebus/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/messagebus/metadata.xml
index 95e86c1210..d4390c2eb5 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/messagebus/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/messagebus/metadata.xml
@@ -1,5 +1,5 @@
 <?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>freedesktop-bugs@gentoo.org</email>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/nobody/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/nobody/metadata.xml
index f540000d5a..65e1fc82d8 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/nobody/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/nobody/metadata.xml
@@ -1,5 +1,5 @@
 <?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>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/ntp/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/ntp/metadata.xml
index 3e60a9a347..bc93e527e2 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/ntp/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/ntp/metadata.xml
@@ -1,5 +1,5 @@
 <?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>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/ntp/ntp-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/ntp/ntp-0-r1.ebuild
similarity index 83%
rename from sdk_container/src/third_party/portage-stable/acct-user/ntp/ntp-0.ebuild
rename to sdk_container/src/third_party/portage-stable/acct-user/ntp/ntp-0-r1.ebuild
index 69d774eb2d..cd5fe5a72d 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/ntp/ntp-0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/acct-user/ntp/ntp-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/portage/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/portage/metadata.xml
index d4af1f2514..66da907ee8 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/portage/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/portage/metadata.xml
@@ -1,5 +1,5 @@
 <?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>dev-portage@gentoo.org</email>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/root/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/root/metadata.xml
index f540000d5a..65e1fc82d8 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/root/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/root/metadata.xml
@@ -1,5 +1,5 @@
 <?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>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/root/root-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/root/root-0-r1.ebuild
index f85c77b4cd..ea2e82dfcf 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/root/root-0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/acct-user/root/root-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,10 @@ ACCT_USER_HOME="/root"
 ACCT_USER_HOME_PERMS=0700
 ACCT_USER_GROUPS=( root )
 
+# Avoid reverting changes by the sysadmin.
+# https://bugs.gentoo.org/827813
+ACCT_USER_NO_MODIFY=1
+
 acct-user_add_deps
 
 pkg_prerm() {
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/sshd/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/sshd/metadata.xml
index 3e60a9a347..bc93e527e2 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/sshd/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/sshd/metadata.xml
@@ -1,5 +1,5 @@
 <?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>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/sshd/sshd-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/sshd/sshd-0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/acct-user/sshd/sshd-0.ebuild
rename to sdk_container/src/third_party/portage-stable/acct-user/sshd/sshd-0-r1.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/systemd-coredump/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/systemd-coredump/metadata.xml
index 8e7007e5a4..31123d01cb 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/systemd-coredump/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/systemd-coredump/metadata.xml
@@ -1,5 +1,5 @@
 <?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>systemd@gentoo.org</email>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/systemd-oom/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/systemd-oom/metadata.xml
index 8e7007e5a4..31123d01cb 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/systemd-oom/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/systemd-oom/metadata.xml
@@ -1,5 +1,5 @@
 <?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>systemd@gentoo.org</email>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/systemd-timesync/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/systemd-timesync/metadata.xml
index 8e7007e5a4..31123d01cb 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/systemd-timesync/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/systemd-timesync/metadata.xml
@@ -1,5 +1,5 @@
 <?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>systemd@gentoo.org</email>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/tss/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/tss/metadata.xml
index 52d5228a45..fdd29c016a 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/tss/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/acct-user/tss/metadata.xml
@@ -1,11 +1,11 @@
 <?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">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
-		<name>Salah Coronya</name>
+		<name>Christopher Byrne</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sdk_container/src/third_party/portage-stable/acct-user/tss/tss-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/tss/tss-0-r1.ebuild
similarity index 84%
rename from sdk_container/src/third_party/portage-stable/acct-user/tss/tss-0.ebuild
rename to sdk_container/src/third_party/portage-stable/acct-user/tss/tss-0-r1.ebuild
index f6726ec183..55a6438895 100644
--- a/sdk_container/src/third_party/portage-stable/acct-user/tss/tss-0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/acct-user/tss/tss-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7