diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 29d1185..2401b86 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,5 +5,9 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*  @gsantomaggio @harsimranmaan
+*  @gsantomaggio
+cmd/tools/cli/*  @harsimranmaan @gsantomaggio
 cmd/tools/web-ui/* @dottorblaster
+cmd/tools/cli/init.go @alfsuse
+internal/infra/* @alfsuse
+cmd/tools/cli/cli.go @saiyam1814 @gsantomaggio