diff --git a/main.tf b/main.tf
index 5285d4d..8b34e27 100644
--- a/main.tf
+++ b/main.tf
@@ -182,7 +182,10 @@ resource "github_repository_file" "codeowners" {
   file       = "CODEOWNERS"
   content = "* ${join(
     " ",
-    formatlist("@${var.organization_name}/%s", try(each.value.teams, []))
+    concat(
+      formatlist("@${var.organization_name}/%s", try(each.value.teams, [])),
+      formatlist("@%s", try(each.value.users, []))
+    )
   )}"
   commit_message      = "Managed by Terraform"
   commit_author       = "mage-os-ci"
diff --git a/variables.tf b/variables.tf
index 039a187..21a7377 100644
--- a/variables.tf
+++ b/variables.tf
@@ -603,6 +603,7 @@ variable "repositories" {
     module-theme-adminhtml-switcher = {
       description = "Admin theme switcher for Magento"
       teams       = ["distribution"]
+      users       = ["artKozynets"]
       topics      = ["mage-os", "magento", "ecommerce", "magento2", "adobecommerce", "mage-os-lab", "extension", "admin"]
     }
 
@@ -633,6 +634,7 @@ variable "repositories" {
     theme-adminhtml-m137 = {
       description = "M137 Admin Theme for Magento/Mage-OS"
       teams       = ["distribution"]
+      users       = ["artKozynets"]
       topics      = ["mage-os", "magento", "ecommerce", "magento2", "adobecommerce", "mage-os-lab", "theme", "admin"]
     }
   }