diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e902dc7124..a35eb9981f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,4 @@
-# Joshua must review all changes to deployment and build.sh
-deployment/*    @joshuaboniface
+.ci             @dkanada @EraYaN
+.github         @jellyfin/core
 build.sh        @joshuaboniface
+deployment      @joshuaboniface