diff --git a/CODEOWNERS b/CODEOWNERS
index 8b95459a8290..77f948de3eff 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,20 @@
+/cmd/multinode/ @profclems
+/cmd/storagenode/ @profclems
+/cmd/storagenode-updater/ @profclems
+/cmd/uplink/ @kaloyan-raev
 
-satellite/{metabase,metainfo,repair,gracefulexit} @mniewrzal @Fadila82 @Qweder93 @Erikvv
-cmd/{storagenode,storagenode-updater,multinode} @profclems
-{multinode,storagenode} @profclems
+/multinode/ @profclems
+
+/satellite/analytics/ @mobyvb @wilfred-asomanii
+/satellite/console/ @mobyvb @cam-a
+/satellite/gracefulexit/ @mniewrzal @Fadila82 @Qweder93 @Erikvv
+/satellite/metabase/ @mniewrzal @Fadila82 @Qweder93 @Erikvv
+/satellite/metainfo/ @mniewrzal @Fadila82 @Qweder93 @Erikvv
+/satellite/payments/stripecoinpayments/ @mobyvb
+/satellite/repair/ @mniewrzal @Fadila82 @Qweder93 @Erikvv
+
+/storagenode/ @profclems
+
+/web/multinode/ @profclems
+/web/satellite/ @wilfred-asomanii @jewharton
+/web/storagenode/ @profclems