diff --git a/src/docs-assembler/assembler.yml b/src/docs-assembler/assembler.yml
index ed3576da..f6232c55 100644
--- a/src/docs-assembler/assembler.yml
+++ b/src/docs-assembler/assembler.yml
@@ -37,6 +37,7 @@ references:
     skip: true
   apm-aws-lambda:
   apm-k8s-attacher:
+  apm-server:
   beats:
     skip: true
   cloud-on-k8s:
diff --git a/src/docs-assembler/navigation.yml b/src/docs-assembler/navigation.yml
index 3b3f8dcb..4fdaeb01 100644
--- a/src/docs-assembler/navigation.yml
+++ b/src/docs-assembler/navigation.yml
@@ -38,61 +38,158 @@ toc:
   #################
   # RELEASE NOTES #
   #################
-  # I didn't touch this section (yet?)
   - toc: release-notes
     children:
-      # repo is short for
-      # - toc: <repo>://<parent_toc>
-      #   path_prefix: <parent_toc>/<repo>
-      - repo: asciidocalypse
-      - repo: apm-agent-android
-      - repo: apm-agent-dotnet
-      - repo: apm-agent-go
-      - repo: apm-agent-ios
-      - repo: apm-agent-java
-      - repo: apm-agent-nodejs
-      - repo: apm-agent-php
-      - repo: apm-agent-python
-      - repo: apm-agent-ruby
-      - repo: apm-agent-rum-js
-      - repo: apm-aws-lambda
-      - repo: apm-k8s-attacher
-      - repo: beats
-      - repo: cloud-on-k8s
-      - repo: cloud
-      - repo: curator
-      - repo: ecctl
-      - repo: ecs-dotnet
-      - repo: ecs-logging-go-logrus
-      - repo: ecs-logging-go-zap
-      - repo: ecs-logging-go-zerolog
-      - repo: ecs-logging-java
-      - repo: ecs-logging-nodejs
-      - repo: ecs-logging-php
-      - repo: ecs-logging-python
-      - repo: ecs-logging-ruby
-      - repo: ecs-logging
-      - repo: ecs
-      - repo: eland
-      - repo: elastic-serverless-forwarder
-      - repo: elasticsearch-hadoop
-      - repo: elasticsearch-java
-      - repo: elasticsearch-js
-      - repo: elasticsearch-net
-      - repo: elasticsearch-php
-      - repo: elasticsearch-py
-      - repo: elasticsearch-rs
-      - repo: elasticsearch-ruby
-      - repo: elasticsearch
-      - repo: go-elasticsearch
-      - repo: integrations
-      - repo: kibana
-      - repo: logstash-docs
-      - repo: logstash
-      - repo: search-ui
-      - repo: integration-docs
-      - repo: security-docs
-
+    # Elasticsearch
+    # ✅ https://github.com/elastic/elasticsearch/blob/main/docs/release-notes/toc.yml
+    - toc: elasticsearch://release-notes
+      path_prefix: release-notes/elasticsearch
+      children:
+        # Elasticsearch Java Client
+        # ✅ https://github.com/elastic/elasticsearch-java/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-java://release-notes
+          path_prefix: release-notes/elasticsearch/clients/java
+
+        # Elasticsearch JavaScript Client
+        # ✅ https://github.com/elastic/elasticsearch-js/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-js://release-notes
+          path_prefix: release-notes/elasticsearch/clients/javascript
+
+        # Elasticsearch .NET Client
+        # ✅ https://github.com/elastic/elasticsearch-net/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-net://release-notes
+          path_prefix: release-notes/elasticsearch/clients/dotnet
+
+        # Elasticsearch PHP Client
+        # ✅ https://github.com/elastic/elasticsearch-php/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-php://release-notes
+          path_prefix: release-notes/elasticsearch/clients/php
+
+        # Elasticsearch Python Client
+        # ✅ https://github.com/elastic/elasticsearch-py/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-py://release-notes
+          path_prefix: release-notes/elasticsearch/clients/python
+
+        # Elasticsearch Ruby Client
+        # ✅ https://github.com/elastic/elasticsearch-ruby/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-ruby://release-notes
+          path_prefix: release-notes/elasticsearch/clients/ruby
+
+        # Elasticsearch for Apache Hadoop
+        # ✅ https://github.com/elastic/elasticsearch-hadoop/blob/main/docs/release-notes/toc.yml
+        - toc: elasticsearch-hadoop://release-notes
+          path_prefix: release-notes/elasticsearch-hadoop
+
+    # Kibana
+    # ✅ https://github.com/elastic/kibana/blob/main/docs/release-notes/toc.yml
+    - toc: kibana://release-notes
+      path_prefix: release-notes/kibana
+
+    # Logstash
+    # ✅ https://github.com/elastic/logstash/blob/main/docs/release-notes/toc.yml
+    - toc: logstash://release-notes
+      path_prefix: release-notes/logstash
+
+    # Beats
+    # ✅ https://github.com/elastic/beats/blob/main/docs/release-notes/toc.yml
+    - toc: beats://release-notes
+      path_prefix: release-notes/beats
+
+    # Fleet and Elastic Agent
+    # ✅ https://github.com/elastic/docs-content/blob/main/release-notes/fleet-elastic-agent/toc.yml
+    - toc: docs-content://release-notes/fleet-elastic-agent
+      path_prefix: release-notes/fleet
+
+    # Elastic Cloud Hosted
+    # ✅ https://github.com/elastic/cloud/blob/master/docs/release-notes/cloud-hosted/toc.yml
+    - toc: cloud://release-notes/cloud-hosted
+      path_prefix: release-notes/cloud-hosted
+
+    # Elastic Cloud Serverless
+    # ✅ https://github.com/elastic/docs-content/blob/main/release-notes/elastic-cloud-serverless/toc.yml
+    - toc: docs-content://release-notes/elastic-cloud-serverless
+      path_prefix: release-notes/cloud-serverless
+
+    # Elastic Cloud Enterprise
+    # ✅ https://github.com/elastic/cloud/blob/master/docs/release-notes/cloud-hosted/toc.yml
+    - toc: cloud://release-notes/cloud-enterprise
+      path_prefix: release-notes/cloud-enterprise
+
+    # Elastic Cloud on Kubernetes
+    # ✅ https://github.com/elastic/cloud-on-k8s/blob/main/docs/release-notes/toc.yml
+    - toc: cloud-on-k8s://release-notes
+      path_prefix: release-notes/cloud-on-k8s
+
+    # Elastic Observability
+    # ✅ https://github.com/elastic/docs-content/blob/main/release-notes/elastic-observability/toc.yml
+    - toc: docs-content://release-notes/elastic-observability
+      path_prefix: release-notes/observability
+      children:
+        # Elastic APM
+        # ✅ https://github.com/elastic/docs-content/blob/main/release-notes/elastic-apm/toc.yml
+        - toc: apm-server://release-notes
+          path_prefix: release-notes/apm
+
+        # Elastic APM Android Agent
+        # ✅ https://github.com/elastic/apm-agent-android/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-android://release-notes
+          path_prefix: release-notes/apm/agents/android
+
+        # Elastic APM .NET Agent
+        # ✅ https://github.com/elastic/apm-agent-dotnet/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-dotnet://release-notes
+          path_prefix: release-notes/apm/agents/dotnet
+
+        # Elastic APM Go Agent
+        # ✅ https://github.com/elastic/apm-agent-go/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-go://release-notes
+          path_prefix: release-notes/apm/agents/go
+
+        # Elastic APM iOS Agent
+        # ✅ https://github.com/elastic/apm-agent-ios/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-ios://release-notes
+          path_prefix: release-notes/apm/agents/ios
+
+        # Elastic APM Java Agent
+        # ✅ https://github.com/elastic/apm-agent-java/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-java://release-notes
+          path_prefix: release-notes/apm/agents/java
+
+        # Elastic APM Node.js Agent
+        # ✅ https://github.com/elastic/apm-agent-nodejs/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-nodejs://release-notes
+          path_prefix: release-notes/apm/agents/nodejs
+
+        # Elastic APM PHP Agent
+        # ✅ https://github.com/elastic/apm-agent-php/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-php://release-notes
+          path_prefix: release-notes/apm/agents/php
+
+        # Elastic APM Python Agent
+        # ✅ https://github.com/elastic/apm-agent-python/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-python://release-notes
+          path_prefix: release-notes/apm/agents/python
+
+        # Elastic APM Ruby Agent
+        #     https://github.com/elastic/apm-agent-ruby/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-ruby://release-notes
+          path_prefix: release-notes/apm/agents/ruby
+
+        # Elastic APM RUM JavaScript Agent
+        # ✅ https://github.com/elastic/apm-agent-rum-js/blob/main/docs/release-notes/toc.yml
+        - toc: apm-agent-rum-js://release-notes
+          path_prefix: release-notes/apm/agents/rum-js
+
+        # Elastic APM AWS Lambda Extension
+        # ✅ https://github.com/elastic/apm-aws-lambda/blob/main/docs/release-notes/toc.yml
+        - toc: apm-aws-lambda://release-notes
+          path_prefix: release-notes/apm/aws-lambda
+
+    # Elastic Security
+    # ✅ https://github.com/elastic/docs-content/blob/main/release-notes/elastic-security/toc.yml
+    - toc: docs-content://release-notes/elastic-security
+      path_prefix: release-notes/elastic-security
+      
   #############
   # REFERENCE #
   #############
@@ -512,4 +609,4 @@ toc:
       # Glossary
       # 🔜 https://github.com/elastic/docs-content/blob/prepare-for-assembler/reference/glossary/toc.yml
       - toc: docs-content://reference/glossary
-        path_prefix: reference/glossary
\ No newline at end of file
+        path_prefix: reference/glossary