diff --git a/CODEOWNERS b/CODEOWNERS
index 1adacb57b0..aef4bb3107 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,10 +1,31 @@
 * @amje @ValeraS
 /src/components/ArrowToggle @Marginy605
 /src/components/Breadcrumbs @vrozaev
+/src/components/Button @amje
 /src/components/Card @Lunory
+/src/components/Checkbox @Kail1112
+# /src/components/ClipboardButton @damask
+# /src/components/ClipboardIcon @damask
+# /src/components/CopyToClipboard @damask
+# /src/components/Dialog @Volodomor
+/src/components/DropdownMenu @axtk
+/src/components/Icon @amje
+/src/components/Label @amje
 /src/components/List @korvin89
-/src/components/Skeleton @pseudopirate
+/src/components/Loader @SeqviriouM
+/src/components/Modal @amje
+/src/components/Popover @kseniya57
+/src/components/Popup @amje
+/src/components/Portal @amje
+/src/components/Progress @mfyodorov
 /src/components/Select @korvin89
+/src/components/Skeleton @pseudopirate
+/src/components/Stories @DarkGenius
+# /src/components/Switch @trabemz
+/src/components/Table @krozhkov
+/src/components/Tabs @sofiushko
+/src/components/Text @IsaevAlexandr
+#/src/components/TextInput @dustyo-O
 /src/components/Toaster @korvin89
 # Allow everyone to publish releases
 /package.json