diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e35b9f733..7b7dbe18c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -23,6 +23,7 @@
 /hooks_receiver/ @hamir-suspect @DamjanBecirovic @forestileao
 /keycloak/ @skipi @hamir-suspect
 /loghub2/ @lucaspin @hamir-suspect @DamjanBecirovic
+/mcp_server/ @DamjanBecirovic @hamir-suspect @dexyk
 /notifications/ @hamir-suspect @dexyk @DamjanBecirovic
 /periodic_scheduler/ @DamjanBecirovic @dexyk @skipi
 /plumber/ @DamjanBecirovic @dexyk @skipi