diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2e6a592..1d39dc3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,17 +1,21 @@
-*                                                 @celonis/astro
+*                                                 @celonis/studio-platform
 
-/*                                                @celonis/astro
-/src                                              @celonis/astro
-/src/core                                         @celonis/astro
+/*                                                @celonis/studio-platform
+/src                                              @celonis/studio-platform
+/src/core                                         @celonis/studio-platform
 /src/commands/configuration-management/           @celonis/astro
-/src/commands/profile/                            @celonis/astro
+/tests/commands/configuration-management/         @celonis/astro
+/src/commands/profile/                            @celonis/studio-platform
 /src/commands/asset-registry/                     @celonis/astro
+/tests/commands/asset-registry/                   @celonis/astro
 /src/commands/deployment/                         @celonis/astro
+/tests/commands/deployment/                       @celonis/astro
 /src/commands/action-flows/                       @celonis/process-automation
 /tests/commands/action-flows/                     @celonis/process-automation
 /src/commands/analysis/                           @celonis/process-analytics
 /src/commands/cpm4/                               @celonis/cpm4
 /src/commands/data-pipeline/                      @Dusan-r @IvanGandacov @EktaCelonis @gorasoCelonis
 /src/commands/studio/                             @celonis/astro
-/package.json                                     @celonis/astro @aocelo @siavash-celonis
-/yarn.lock                                        @celonis/astro @aocelo @siavash-celonis
+/tests/commands/studio/                           @celonis/astro
+/package.json                                     @celonis/studio-platform @aocelo @siavash-celonis
+/yarn.lock                                        @celonis/studio-platform @aocelo @siavash-celonis