diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 65d2f5588e..e8f1b7eb8b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,11 @@
 *       @sunnypilot/dev-internal
 /.github/ @devtekve @sunnyhaibin
-/release/ci/ @devtekve @sunnyhaibin
\ No newline at end of file
+/release/ci/ @devtekve @sunnyhaibin
+/tinygrad_repo @devtekve @Discountchubbs
+/tinygrad/ @devtekve @Discountchubbs
+/selfdrive/controls/lib/longitudinal_planner.py @devtekve @Discountchubbs
+/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py @devtekve @Discountchubbs
+/selfdrive/modeld/ @devtekve @Discountchubbs
+/sunnypilot/model* @devtekve @Discountchubbs
+/sunnypilot/sunnylink/ @devtekve
+/system/athena/ @devtekve
\ No newline at end of file