diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 732a59b1d..f40b5cfd8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,13 +1,14 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax @duplexsystem @Astrashh @justaureus
+*                   @dfsek @solonovamax @duplexsystem @astrsh @justaureus
 
 # Platforms
 /platforms/         @dfsek @solonovamax @duplexsystem @justaureus
+/platforms/bukkit   @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf
 
 # Common
-/common/            @dfsek @solonovamax @duplexsystem @Astrashh
+/common/            @dfsek @solonovamax @duplexsystem @astrsh
 
 # Gradle Stuff
 /buildSrc/          @dfsek @solonovamax @duplexsystem
 *.gradle.kts        @dfsek @solonovamax @duplexsystem
-/gradle/            @dfsek @solonovamax @duplexsystem
\ No newline at end of file
+/gradle/            @dfsek @solonovamax @duplexsystem