diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 68fed2b8b1..879cf639b2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -29,14 +29,14 @@ docs/references/advanced-ingress-messages.mdx @dfinity/product-security @dfinity
 docs/references/message-execution-properties.mdx @dfinity/product-security @dfinity/editorial
 src/pages/security-advisories.tsx @dfinity/product-security @dfinity/editorial
 
-# Execution
-docs/references/execution-errors.mdx @dfinity/team-dsm @dfinity/editorial
-docs/building-apps/interact-with-canisters/advanced-calls.mdx @dfinity/team-dsm @dfinity/editorial
-docs/building-apps/essentials/message-execution.mdx @dfinity/team-dsm @dfinity/editorial
-docs/building-apps/network-features/simd.mdx @dfinity/team-dsm @dfinity/editorial
-docs/building-apps/network-features/periodic-tasks-timers.mdx @dfinity/team-dsm @dfinity/editorial
-docs/building-apps/canister-management/backtraces.mdx @dfinity/team-dsm @dfinity/editorial
-docs/building-apps/advanced/canister-migration.mdx @dfinity/team-dsm @dfinity/editorial
+# Core Protocol
+docs/references/execution-errors.mdx @dfinity/core-protocol @dfinity/editorial
+docs/building-apps/interact-with-canisters/advanced-calls.mdx @dfinity/core-protocol @dfinity/editorial
+docs/building-apps/essentials/message-execution.mdx @dfinity/core-protocol @dfinity/editorial
+docs/building-apps/network-features/simd.mdx @dfinity/core-protocol @dfinity/editorial
+docs/building-apps/network-features/periodic-tasks-timers.mdx @dfinity/core-protocol @dfinity/editorial
+docs/building-apps/canister-management/backtraces.mdx @dfinity/core-protocol @dfinity/editorial
+docs/building-apps/advanced/canister-migration.mdx @dfinity/core-protocol @dfinity/editorial
 
 # Boundary Node
 docs/building-apps/frontends/custom-domains/ @dfinity/boundary-node @dfinity/editorial
@@ -46,10 +46,10 @@ docs/building-apps/advanced/canister-access-logs.mdx @dfinity/boundary-node @dfi
 docs/building-apps/network-features/using-http/http-certification/ @dfinity/trust @dfinity/editorial
 
 # The Interface Specification
-docs/references/_attachments/certificates.cddl @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
-docs/references/_attachments/http-gateway.did @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
-docs/references/_attachments/ic.did @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
-docs/references/_attachments/interface-spec-changelog.md @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
-docs/references/_attachments/requests.cddl @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
-docs/references/http-gateway-protocol-spec.md @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
-docs/references/ic-interface-spec.md @dfinity/interface-spec @dfinity/team-dsm @dfinity/consensus @dfinity/editorial
+docs/references/_attachments/certificates.cddl @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial
+docs/references/_attachments/http-gateway.did @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial
+docs/references/_attachments/ic.did @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial
+docs/references/_attachments/interface-spec-changelog.md @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial
+docs/references/_attachments/requests.cddl @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial
+docs/references/http-gateway-protocol-spec.md @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial
+docs/references/ic-interface-spec.md @dfinity/interface-spec @dfinity/core-protocol @dfinity/editorial