diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 82c1674..ceb9ab8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,6 @@
 # Default owner for everything
 * @KRRT7
 
-# Claude Code plugin
-# /plugin/ @KRRT7
-
-# Python packages
-# /code_to_optimize/ @KRRT7
-# /codeflash/ @KRRT7
-
-# Case studies
-# /.codeflash/ @KRRT7
+# Language overlays
+/plugin/languages/go/ @m-ali-24
+/plugin/languages/java/ @mashraf-222