diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -31,73 +31,71 @@
 # revision or makes a commit to the specified subtree.
 # ***
 
-autofs/	@trasz
-iscsi/	@trasz
-kqueue/	@jmgurney
-libpam/		@dag-erling
-linprocfs/	@dag-erling
-opencrypto/	@jmgurney
-openssl/	@juikim
-procfs/		@dag-erling
-pseudofs/	@dag-erling
-rctl/	@trasz
-vmm/	@bsdjhb @grehan-freebsd
 /bin/sh		@jillest
-/contrib/atf		@ngie
-/contrib/capsicum-test	@ngie
-/contrib/googletest	@ngie
+/contrib/atf		@ngie-eign
+/contrib/capsicum-test	@ngie-eign
+/contrib/googletest	@ngie-eign
 /contrib/ipfilter	@cschuber
 /contrib/libcxxrt	@DimitryAndric @emaste
 /contrib/llvm-project	@DimitryAndric
 /contrib/llvm-project/libunwind @DimitryAndric @emaste @bsdjhb
 /contrib/llvm-project/lldb @DimitryAndric @emaste
 /contrib/llvm-project/openmp @DimitryAndric @emaste
-/contrib/netbsd-tests	@ngie
-/contrib/pjdfstest	@ngie @asomers
+/contrib/netbsd-tests	@ngie-eign
+/contrib/netbsd-tests/crypto/opencrypto/	@jmgurney
+/contrib/netbsd-tests/kernel/kqueue/	@jmgurney
+/contrib/openpam/lib/libpam/		@dag-erling
+/contrib/pjdfstest	@ngie-eign @asomers
 /crypto/openssh	@dag-erling
+/crypto/openssl/	@juikim
 /etc/mail	@gshapiro
 /etc/sendmail	@gshapiro
 /lib/libc/sys/kevent.c	@jmgurney
-/lib/libdpv	@devinteske
 /lib/libfetch	@dag-erling
 /lib/libfigpar	@dag-erling
+/lib/libpam/		@dag-erling
 /lib/libvmmapi	@bsdjhb @grehan-freebsd
+/libexec/rc/rc.d/rctl/	@trasz
 /sbin/mount_fusefs @asomers
-/share/mk	@bsdimp @bapt @bdrewery @emaste @sgerraty
-/stand/forth	@devinteske
+/secure/usr.bin/openssl/	@juikim
+/share/mk	@bsdimp @bapt @bdrewery @emaste
 /stand/lua	@kevans91
 /sys/amd64/pci	@bsdimp @bsdjhb
+/sys/amd64/vmm/	@bsdjhb @grehan-freebsd
 /sys/arm/allwinner	@evadot
 /sys/arm64/rockchip	@evadot
+/sys/compat/linprocfs/	@dag-erling
 /sys/compat/linuxkpi	@hselasky
-/sys/contrib/dev/ice	@ricera
 /sys/contrib/ipfilter	@cschuber
+/sys/crypto/openssl/	@juikim
 /sys/dev/drm2	@bsdimp
-/sys/dev/e1000	@ricera
-/sys/dev/ice	@ricera
-/sys/dev/ixgbe	@ricera
-/sys/dev/ixl	@ricera
-/sys/dev/ofw	@nwhitehorn
+/sys/dev/iscsi/	@trasz
 /sys/dev/pci	@bsdimp @bsdjhb
 /sys/dev/sound/usb	@hselasky
 /sys/dev/usb	@hselasky
+/sys/fs/autofs/	@trasz
 /sys/fs/fuse/	@asomers
+/sys/fs/procfs/		@dag-erling
+/sys/fs/pseudofs/	@dag-erling
 /sys/kern/vfs_aio.c	@asomers
 /sys/netinet/ip_carp.c	@glebius
-/sys/netinet/sctp_*	@tuexen
-/sys/netpfil/pf	@kprovost @glebius
+/sys/netpfil/pf	@glebius
+/sys/opencrypto/	@jmgurney
 /sys/x86/pci	@bsdimp @bsdjhb
-/tests	@ngie
+/tests	@ngie-eign
 /tests/sys/aio/	@asomers
 /tests/sys/fs/fusefs/ @asomers
+/tests/sys/kqueue/	@jmgurney
+/tests/sys/opencrypto/	@jmgurney
 /tools/build	@bsdimp
+/tools/regression/iscsi/	@trasz
+/tools/regression/sockets/kqueue/	@jmgurney
 /tools/tools/nanobsd	@bsdimp
-/usr.bin/dpv	@devinteske
+/usr.bin/fetch	@dag-erling
+/usr.bin/rctl/	@trasz
 /usr.bin/top	@grimreaper
+/usr.sbin/autofs/	@trasz
 /usr.sbin/bhyve	@bsdjhb @grehan-freebsd
 /usr.sbin/bhyvectl	@bsdjhb @grehan-freebsd
 /usr.sbin/bhyveload	@bsdjhb @grehan-freebsd
-/usr.sbin/bsdconfig	@devinteske
 /usr.sbin/lpr	@gbergling
-/usr.sbin/sysrc	@devinteske
-/usr/bin/fetch	@dag-erling