diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3413dae59f4..98b4d85450b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,26 +11,18 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Global rule:
-*  @wpilibsuite/wpilib
+*  @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/cameraserver/  @wpilibsuite/camera-server
+/epilogue-*/ @SamCarlberg @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/cscore/  @wpilibsuite/camera-server
+/romiVendordep/ @zhiquanyeo @jpokornyiii @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/hal/  @wpilibsuite/hardware
-/hal/src/main/java/**/sim/  @wpilibsuite/simulation
-/hal/src/main/native/include/mockdata/  @wpilibsuite/simulation
-/hal/src/main/native/include/simulation/  @wpilibsuite/simulation
-/hal/src/main/native/sim/  @wpilibsuite/simulation
+/simulation/  @zhiquanyeo @jpokornyiii @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/ntcore/  @wpilibsuite/network-tables
+/wpilibNewCommands/ @Starlight220 @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/simulation/  @wpilibsuite/simulation
+/wpilib?Examples/ @sciencewhiz @jasondaming @Starlight220 @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/wpilibNewCommands/  @wpilibsuite/commandbased
+/wpiunits/ @SamCarlberg @PeterJohnson @ThadHouse @calcmogul @rzblue
 
-/wpilibcExamples/  @wpilibsuite/wpilib @wpilibsuite/documentation
-
-/wpilibjExamples/  @wpilibsuite/wpilib @wpilibsuite/documentation
-
-/wpiutil/  @PeterJohnson
+/xrpVendordep/ @zhiquanyeo @jpokornyiii @PeterJohnson @ThadHouse @calcmogul @rzblue