diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 90f5aacd68..e681fc5687 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Global rule:
-* @microsoft/akvelon-build-task-team    @microsoft/azure-pipelines-platform
+* @microsoft/azure-pipelines-tasks-and-agent @microsoft/akvelon-build-task-team    @microsoft/azure-pipelines-platform