diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 287f8e2bb1..72e46aadae 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,32 +1,30 @@
-# Give everyone ownership for everything expections listed below
-* @wundergraph/Cosmo @wundergraph/Router
+# Give everyone ownership for everything exceptions listed below
+*                   @wundergraph/Cosmo @wundergraph/Router
 
 # Protect the CODEOWNERS file
-/.github/CODEOWNERS @StarpTech @Aenimus
+/.github/CODEOWNERS @wundergraph/Owners
 
-/admission-server/ @JivusAyrus @StarpTech @thisisnithin @wilsonrivera @Aenimus
-/cdn-server/ @JivusAyrus @StarpTech @thisisnithin @wilsonrivera @Aenimus
-/cli/ @endigma @JivusAyrus @StarpTech @jensneuse @wilsonrivera @Aenimus @thisisnithin
-/composition/ @Aenimus @JivusAyrus @StarpTech @thisisnithin @wilsonrivera
-/connect/ @Aenimus @JivusAyrus @StarpTech @jensneuse @endigma @wilsonrivera @thisisnithin
-/connect-go/ @Aenimus @JivusAyrus @StarpTech @jensneuse @endigma @wilsonrivera @thisisnithin
-/controlplane/ @JivusAyrus @wilsonrivera @StarpTech @thisisnithin @Aenimus
-/graphqlmetrics/ @Noroth @pepol @StarpTech
-/helm/ @Noroth @pepol @StarpTech
-/infrastructure/ @Noroth @pepol @StarpTech
-/keycloak/ @JivusAyrus @wilsonrivera @StarpTech @thisisnithin @Aenimus
-/otelcollector/ @Noroth @pepol @StarpTech
-/playground/ @wundergraph/Router @thisisnithin @StarpTech @Aenimus @JivusAyrus
-/proto/ @JivusAyrus @wilsonrivera @StarpTech @endigma
-/protographic/ @Noroth @StarpTech @endigma @dkorittki
-# Same owner for router and tests to avoid requesting too many reviewers
-/router/ @Noroth @devsergiy @StarpTech @jensneuse @endigma @SkArchon
-/router-tests/ @Noroth @devsergiy @StarpTech @jensneuse @endigma @SkArchon
-/router-plugin/ @Noroth @StarpTech @endigma @devsergiy @SkArchon
-/shared/ @Aenimus @JivusAyrus @StarpTech @thisisnithin @wilsonrivera
-/studio/ @JivusAyrus @wilsonrivera @StarpTech @thisisnithin @Aenimus
-# Cosmo Streams / EDFS
-/router/pkg/pubsub @alepane21 @StarpTech @jensneuse @dkorittki
+/.github/actions/   @wundergraph/Platform
+/.github/scripts/   @wundergraph/Platform
+/.github/workflows/ @wundergraph/Platform
+/admission-server/  @wundergraph/Cosmo
+/cdn-server/        @wundergraph/Cosmo @wundergraph/Platform
+/cli/               @wundergraph/Cosmo
+/composition/       @wundergraph/Cosmo
+/connect/           @wundergraph/Router
+/connect-go/        @wundergraph/Router
+/controlplane/      @wundergraph/Cosmo
+/graphqlmetrics/    @wundergraph/Platform
+/helm/              @wundergraph/Platform
+/infrastructure/    @wundergraph/Platform
+/keycloak/          @wundergraph/Cosmo
+/otelcollector/     @wundergraph/Platform
+/playground/        @wundergraph/Cosmo
+/protographic/      @wundergraph/Router
+/router/            @wundergraph/Router
+/router-tests/      @wundergraph/Router
+/router-plugin/     @wundergraph/Router
+/studio/            @wundergraph/Cosmo
 
 # generated protobuf files, sourced from /proto/
 /router/gen/
diff --git a/.github/workflows/codecov-post-merge.yaml b/.github/workflows/codecov-post-merge.yaml
index 773a4f6745..c12da525ba 100644
--- a/.github/workflows/codecov-post-merge.yaml
+++ b/.github/workflows/codecov-post-merge.yaml
@@ -6,6 +6,7 @@ on:
     paths-ignore:
       - 'docs-website/**'
       - '*.md'
+      - '.github/CODEOWNERS'
 
 env:
   CI: true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 60a69c6850..e4f43730bb 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,12 +18,14 @@ on:
     paths-ignore:
       - 'docs-website/**'
       - '*.md'
+      - '.github/CODEOWNERS'
   pull_request:
     branches:
       - main
     paths-ignore:
       - 'docs-website/**'
       - '*.md'
+      - '.github/CODEOWNERS'
   schedule:
     - cron: '27 3 * * 1'
 
diff --git a/.github/workflows/dummy-ci.yaml b/.github/workflows/dummy-ci.yaml
index 184de61402..aa36e2d0cc 100644
--- a/.github/workflows/dummy-ci.yaml
+++ b/.github/workflows/dummy-ci.yaml
@@ -14,6 +14,7 @@ on:
       - 'SECURITY.md'
       - 'LICENSE'
       - '.github/PULL_REQUEST_TEMPLATE.md'
+      - '.github/CODEOWNERS'
 jobs:
   build_test:
     timeout-minutes: 5
diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index cf2e5fc8b3..b369dddc32 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -10,6 +10,7 @@ on:
     paths-ignore:
       - 'docs-website/**'
       - '*.md'
+      - '.github/CODEOWNERS'
 
 permissions:
   contents: write
diff --git a/.github/workflows/release-preview.yaml b/.github/workflows/release-preview.yaml
index 63791b3720..482200c766 100644
--- a/.github/workflows/release-preview.yaml
+++ b/.github/workflows/release-preview.yaml
@@ -9,6 +9,7 @@ on:
     paths-ignore:
       - 'docs*/**'
       - '*.md'
+      - '.github/CODEOWNERS'
 
 concurrency:
   group: ${{github.workflow}}-${{github.head_ref}}