diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4f877f47c5..58688519ef 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,33 +2,33 @@
 # the repo. Unless a later match takes precedence,
 * @remyleone
 
-/internal/services/account/ @Codelax
-/internal/services/applesilicon/ @Laure-di
-/internal/services/baremetal/ @Laure-di
-/internal/services/billing/ @yfodil
-/internal/services/block/ @Codelax
-/internal/services/cockpit/ @jremy42
-/internal/services/container/ @Codelax
-/internal/services/documentdb/ @jremy42
-/internal/services/domain/ @yfodil
-/internal/services/flexibleip/ @yfodil
-/internal/services/function/ @Codelax
-/internal/services/iam/ @Codelax
-/internal/services/instance/ @Codelax
-/internal/services/iot/ @jremy42
-/internal/services/ipam/ @yfodil
-/internal/services/jobs/ @Codelax
-/internal/services/k8s/ @Mia-Cross
-/internal/services/lb/ @yfodil
-/internal/services/marketplace/ @Codelax
-/internal/services/mnq/ @Codelax
-/internal/services/object/ @Mia-Cross
-/internal/services/rdb/ @jremy42
-/internal/services/redis/ @jremy42
-/internal/services/registry/ @Mia-Cross
-/internal/services/sdb/ @jremy42
-/internal/services/secret/ @Codelax
-/internal/services/tem/ @jremy42
-/internal/services/vpc/ @yfodil
-/internal/services/vpcgw/ @yfodil
-/internal/services/webhosting/ @jremy42
+/internal/services/account/ @scaleway/devtools-core
+/internal/services/applesilicon/ @scaleway/devtools-compute-foundation
+/internal/services/baremetal/ @scaleway/devtools-compute-foundation
+/internal/services/billing/ @scaleway/devtools-core
+/internal/services/block/ @scaleway/devtools-storage
+/internal/services/cockpit/ @scaleway/devtools-dms
+/internal/services/container/ @scaleway/devtools-compute
+/internal/services/documentdb/ @scaleway/devtools-dms
+/internal/services/domain/ @scaleway/devtools-dms
+/internal/services/flexibleip/ @scaleway/devtools-network
+/internal/services/function/ @scaleway/devtools-compute
+/internal/services/iam/ @scaleway/devtools-core
+/internal/services/instance/ @scaleway/devtools-compute
+/internal/services/iot/ @scaleway/devtools-dms
+/internal/services/ipam/ @scaleway/devtools-network
+/internal/services/jobs/ @scaleway/devtools-compute
+/internal/services/k8s/ @scaleway/devtools-compute
+/internal/services/lb/ @scaleway/devtools-network
+/internal/services/marketplace/ @scaleway/devtools-compute
+/internal/services/mnq/ @scaleway/devtools-dms
+/internal/services/object/ @scaleway/devtools-storage
+/internal/services/rdb/ @scaleway/devtools-dms
+/internal/services/redis/ @scaleway/devtools-dms
+/internal/services/registry/ @scaleway/devtools-compute
+/internal/services/sdb/ @scaleway/devtools-dms
+/internal/services/secret/ @scaleway/devtools-core
+/internal/services/tem/ @scaleway/devtools-dms
+/internal/services/vpc/ @scaleway/devtools-network
+/internal/services/vpcgw/ @scaleway/devtools-network
+/internal/services/webhosting/ @scaleway/devtools-dms