diff --git a/website/content/en/administration.adoc b/website/content/en/administration.adoc
--- a/website/content/en/administration.adoc
+++ b/website/content/en/administration.adoc
@@ -74,13 +74,12 @@
 The FreeBSD Documentation Engineering Team is responsible for defining and following up documentation goals for the committers in the Documentation project.
 The https://www.freebsd.org/internal/doceng/[doceng team charter] describes the duties and responsibilities of the Documentation Engineering Team in greater detail.
 
-* {gjb}
-* {carlavilla}
+* {bcr}
 * {blackend}
+* {carlavilla}
 * {dbaio}
-* {bcr}
-* {hrs}
 * {fernape} (Secretary)
+* {hrs}
 
 [[t-portmgr]]
 == FreeBSD Ports Management Team <portmgr@FreeBSD.org>
@@ -126,11 +125,11 @@
 The Primary Release Engineering Team is responsible for setting and publishing release schedules for official project releases of FreeBSD, announcing code freezes and maintaining `releng/*` branches, among other things.
 The https://www.freebsd.org/releng/charter/[release engineering team charter] describes the duties and responsibilities of the Primary Release Engineering Team in greater detail.
 
-* {kib}
 * {blackend}
-* {karels} (Deputy Lead)
-* {delphij}
 * {cperciva} (Lead)
+* {delphij}
+* {karels} (Deputy Lead)
+* {kib}
 
 [[t-donations]]
 == Donations Team <donations@FreeBSD.org>
@@ -138,9 +137,9 @@
 The Donations Team is responsible for responding to donations offers, establishing donation guidelines and procedures, and coordinating donation offers with the FreeBSD developer community.
 A more detailed description of the duties of the Donations Team is available at link:https://www.freebsd.org/donations/[FreeBSD Donations Liaison].
 
-* {gahr}
-* {bhughes}
 * {adridg}
+* {bhughes}
+* {gahr}
 
 [[t-secteam]]
 == Security Team <secteam@FreeBSD.org>
@@ -149,12 +148,11 @@
 Furthermore, it is responsible for resolving software bugs affecting the security of FreeBSD and issuing security advisories.
 The FreeBSD Security Officer Charter describes the duties and responsibilities of the Security Officer in greater detail.
 
-* {gordon} (Officer)
 * {bapt} (Core Team Liaison)
 * {delphij} (Officer Emeritus, Release Engineering Team Liaison)
 * {des} (Officer Emeritus)
-* {gjb} (Cluster Administrators Team Liaison)
 * {emaste} (Officer Deputy)
+* {gordon} (Officer)
 * {markj}
 * {oshogbo}
 * {philip}
@@ -284,7 +282,6 @@
 
 The GitHub Automation team oversees the export of FreeBSD source code repository content to the read-only repository instances on GitHub
 
-* {koobs}
 * {mva}
 * {robak}
 * {rodrigc}
@@ -300,7 +297,6 @@
 * {brd}
 * {brooks}
 * {lwhsu}
-* {swills}
 
 [[t-mirror-admin]]
 == FTP/WWW Mirror Site Coordinators <mirror-admin@>
@@ -372,4 +368,3 @@
 
 * {bofh}
 * {linimon}
-* {koobs}