diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b83cdb3cfc..a16c93eccf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,9 +6,9 @@ serverless-functions/ @SamyOubouaziz
 serverless-containers/ @SamyOubouaziz
 serverless-jobs/ @SamyOubouaziz
 serverless-sql-databases/ @SamyOubouaziz
-account/ @SamyOubouaziz
 developer-tools/ @SamyOubouaziz
 data-lab/ @SamyOubouaziz
+block-storage/ @SamyOubouaziz
 
 # Rowena
 vpc/ @RoRoJ
@@ -27,7 +27,6 @@ apple-silicon/ @bene2k1
 elastic-metal/ @bene2k1
 dedibox-scaleway/ @bene2k1
 kubernetes/ @bene2k1
-webhosting/ @bene2k1
 dedibox/ @bene2k1
 dedibox-vps/ @bene2k1
 dedibox-dns/ @bene2k1
@@ -37,25 +36,27 @@ dedibox-account/ @bene2k1
 dedibox-kvm-over-ip/ @bene2k1
 managed-inference/ @bene2k1
 generative-apis/ @bene2k1
-classic-hosting/ @bene2k1
-cpanel-hosting/ @bene2k1
-
+container-registry/ @bene2k1
 
 
 # Néda
 cockpit/ @nerda-codes
 domains-and-dns/ @nerda-codes
 secret-manager/ @nerda-codes
-block-storage/ @nerda-codes
 key-manager/ @nerda-codes
-audit-trail/ @nerda-codes 
+audit-trail/ @nerda-codes
+classic-hosting/ @nerda-codes
+cpanel-hosting/ @nerda-codes
+webhosting/ @nerda-codes
+
 # Luiza
+account/ @ldecarvalho-doc
 iam/ @ldecarvalho-doc
 managed-databases-for-postgresql-and-mysql/ @ldecarvalho-doc
 managed-databases-for-redis/ @ldecarvalho-doc
-container-registry/ @ldecarvalho-doc
+managed-mongodb-databases/ @ldecarvalho-doc
+environmental-footprint/ @ldecarvalho-doc
 labs/ @ldecarvalho-doc
 billing/ @ldecarvalho-doc
-serverless-sql-databases/ @ldecarvalho-doc
 transactional-email/ @ldecarvalho-doc
 environmental-footprint/ @ldecarvalho-doc
\ No newline at end of file