diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5e16471e05792..ba8e3cd223f7c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -210,11 +210,11 @@
 /docs/cluster-agent/                    @DataDog/documentation @DataDog/container-platform
 /docs/dev/checks/                       @DataDog/documentation @DataDog/agent-metrics-logs
 /docs/cloud-workload-security/          @DataDog/documentation @DataDog/agent-security
+/docs/serverless                        @DataDog/documentation @DataDog/serverless
 
-/docs/public/architecture/components/                        @DataDog/agent-shared-components
-/docs/public/architecture/dogstatsd/                         @DataDog/agent-metrics-logs
-/docs/public/guidelines/components/                          @DataDog/agent-shared-components
-/docs/public/how-to/components/                              @DataDog/agent-shared-components
+/docs/public/components/                                     @DataDog/documentation @DataDog/agent-shared-components
+/docs/public/architecture/dogstatsd/                         @DataDog/documentation @DataDog/agent-metrics-logs
+/docs/public/guidelines/deprecated-components-documentation/ @DataDog/documentation @DataDog/agent-shared-components
 
 /google-marketplace/                    @DataDog/container-ecosystems
 
diff --git a/docs/public/index.md b/docs/public/index.md
index 9e196ba817c35..9fa497f36e833 100644
--- a/docs/public/index.md
+++ b/docs/public/index.md
@@ -18,7 +18,7 @@ First, you'll want to [set up](setup.md) your development environment.
 
 ## Agent development guidelines
 
-To know more about the general design of the Agent and how to add code and feature read our section on [Components]().
+To know more about the general design of the Agent and how to add code and feature read our section on [Components](https://datadoghq.dev/datadog-agent/components/overview/).
 
 ## Navigation