diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f9101a00..d81da417 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,8 +5,8 @@
 # All file changes should be reviewed by the maintainer team unless
 # specified otherwise
 *                          @DataDog/agent-runtimes
-metrics/                   @DataDog/agent-runtimes @DataDog/agent-processing-and-routing
-logs/                      @DataDog/agent-runtimes @DataDog/agent-processing-and-routing
+metrics/                   @DataDog/agent-runtimes @DataDog/agent-metric-pipelines
+logs/                      @DataDog/agent-runtimes @DataDog/agent-log-pipelines
 process/                   @DataDog/agent-runtimes @DataDog/container-app @DataDog/container-intake
 process/connections.proto  @DataDog/agent-runtimes @DataDog/Networks @DataDog/ebpf-platform @DataDog/universal-service-monitoring
 contlcycle/                @DataDog/agent-runtimes @DataDog/container-integrations