diff --git a/.config/dictionaries/project.dic b/.config/dictionaries/project.dic
index 1b2bb638c44..21d710e34ef 100644
--- a/.config/dictionaries/project.dic
+++ b/.config/dictionaries/project.dic
@@ -166,6 +166,7 @@ loguru
 lovelace
 lovelaces
 LTRB
+Lynxx
 mdlint
 metadatum
 metadatums
@@ -185,6 +186,7 @@ Multiplatform
 myproject
 Nami
 nanos
+nathanbogale
 NDEBUG
 netifas
 netkey
@@ -285,6 +287,7 @@ testunit
 thiserror
 thollander
 timelike
+tkach
 Toastify
 todos
 toggleable
@@ -335,4 +338,4 @@ xprv
 xpub
 xpublic
 xvfb
-yoroi
+yoroi
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6be1963f41c..73619052f97 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,9 +1,13 @@
-/athena/ @stevenj @Mr-Leshiy @FelipeRosa @cong-or @saibatizoku
+/athena/ @stevenj @Mr-Leshiy @cong-or @saibatizoku @bkioshn @stanislav-tkach
 
-/catalyst_voices/ @minikin
+/catalyst_voices/ @dtscalac @damian-molinski @LynxLynxx
 
-/catalyst_voices/packages/libs/ @minikin @stevenj
+/catalyst_voices_packages/ @dtscalac @damian-molinski @LynxLynxx
 
-/catalyst-gateway/ @stevenj @Mr-Leshiy @FelipeRosa @cong-or @saibatizoku @minikin
+/catalyst-gateway/ @stevenj @Mr-Leshiy @cong-or @saibatizoku @bkioshn @stanislav-tkach
 
-.md  @stevenj @minikin
+/catalyst-gateway-crates/ @stevenj @Mr-Leshiy @cong-or @saibatizoku @bkioshn @stanislav-tkach
+
+/docs/ @stevenj @neil-iohk @nathanbogale @minikin
+
+.md  @stevenj @minikin
\ No newline at end of file