diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bdcb3cd1b5..b83cdb3cfc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,41 +1,61 @@
 #This is a list of people who will be tagged whenever a PR is opened to edit one of the files listed below.
 
 # Samy
-storage/object/ @SamyOubouaziz
-serverless/functions/ @SamyOubouaziz
-serverless/containers/ @SamyOubouaziz
-serverless/jobs/ @SamyOubouaziz
-serverless/sql-databases/ @SamyOubouaziz
-console/account/ @SamyOubouaziz @pshambulingappa
+object-storage/ @SamyOubouaziz
+serverless-functions/ @SamyOubouaziz
+serverless-containers/ @SamyOubouaziz
+serverless-jobs/ @SamyOubouaziz
+serverless-sql-databases/ @SamyOubouaziz
+account/ @SamyOubouaziz
 developer-tools/ @SamyOubouaziz
+data-lab/ @SamyOubouaziz
 
 # Rowena
-network/vpc/ @RoRoJ
-network/public-gateways/ @RoRoJ
-network/load-balancer/ @RoRoJ
-serverless/messaging/ @RoRoJ
+vpc/ @RoRoJ
+public-gateways/ @RoRoJ
+load-balancer/ @RoRoJ
+messaging/ @RoRoJ
+interlink/ @RoRoJ
+edge-services/ @RoRoJ
+ipam/ @RoRoJ
+iot-hub/ @RoRoJ
 
 # Benedikt
-compute/ @bene2k1
-bare-metal/ @bene2k1
-containers/kubernetes/ @bene2k1
-managed-services/webhosting/ @bene2k1
+instances/ @bene2k1
+gpu/ @bene2k1
+apple-silicon/ @bene2k1
+elastic-metal/ @bene2k1
+dedibox-scaleway/ @bene2k1
+kubernetes/ @bene2k1
+webhosting/ @bene2k1
 dedibox/ @bene2k1
+dedibox-vps/ @bene2k1
+dedibox-dns/ @bene2k1
+dedibox-hardware/ @bene2k1
 dedibox-network/ @bene2k1
-dedibox-console/ @bene2k1
-ai-data/ @bene2k1
+dedibox-account/ @bene2k1
+dedibox-kvm-over-ip/ @bene2k1
+managed-inference/ @bene2k1
+generative-apis/ @bene2k1
+classic-hosting/ @bene2k1
+cpanel-hosting/ @bene2k1
+
 
-# Néda
-observability/ @nerda-codes
-network/domains-and-dns/ @nerda-codes
-identity-and-access-management/secret-manager/ @nerda-codes
-storage/block/ @nerda-codes
 
+# 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 
 # Luiza
-identity-and-access-management/iam/ @ldecarvalho-doc
-managed-databases/postgresql-and-mysql/ @ldecarvalho-doc
-managed-databases/redis/ @ldecarvalho-doc
-containers/container-registry/ @ldecarvalho-doc
+iam/ @ldecarvalho-doc
+managed-databases-for-postgresql-and-mysql/ @ldecarvalho-doc
+managed-databases-for-redis/ @ldecarvalho-doc
+container-registry/ @ldecarvalho-doc
 labs/ @ldecarvalho-doc
-console/billing/ @ldecarvalho-doc @pshambulingappa
-managed-services/transactional-email/ @ldecarvalho-doc
+billing/ @ldecarvalho-doc
+serverless-sql-databases/ @ldecarvalho-doc
+transactional-email/ @ldecarvalho-doc
+environmental-footprint/ @ldecarvalho-doc
\ No newline at end of file