diff --git a/explore-analyze/ai-features.md b/explore-analyze/ai-features.md
index 7135a195c1..3ef1a4abc0 100644
--- a/explore-analyze/ai-features.md
+++ b/explore-analyze/ai-features.md
@@ -71,7 +71,7 @@ The [{{es}}](/solutions/search.md) solution view (or project type in {{serverles
 
 ### Agent Builder
 
-[Agent Builder](/solutions/search/elastic-agent-builder.md) enables you to create AI agents that can interact with your {{es}} data, run queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
+[Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) enables you to create AI agents that can interact with your {{es}} data, run queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
 
 ### AI assistant for {{es}}
 
diff --git a/solutions/search/agent-builder/_snippets/spaces-api-note.md b/explore-analyze/ai-features/agent-builder/_snippets/spaces-api-note.md
similarity index 100%
rename from solutions/search/agent-builder/_snippets/spaces-api-note.md
rename to explore-analyze/ai-features/agent-builder/_snippets/spaces-api-note.md
diff --git a/solutions/search/agent-builder/a2a-server.md b/explore-analyze/ai-features/agent-builder/a2a-server.md
similarity index 100%
rename from solutions/search/agent-builder/a2a-server.md
rename to explore-analyze/ai-features/agent-builder/a2a-server.md
diff --git a/solutions/search/agent-builder/agent-builder-agents.md b/explore-analyze/ai-features/agent-builder/agent-builder-agents.md
similarity index 100%
rename from solutions/search/agent-builder/agent-builder-agents.md
rename to explore-analyze/ai-features/agent-builder/agent-builder-agents.md
diff --git a/solutions/search/agent-builder/chat.md b/explore-analyze/ai-features/agent-builder/chat.md
similarity index 100%
rename from solutions/search/agent-builder/chat.md
rename to explore-analyze/ai-features/agent-builder/chat.md
diff --git a/solutions/search/agent-builder/get-started.md b/explore-analyze/ai-features/agent-builder/get-started.md
similarity index 100%
rename from solutions/search/agent-builder/get-started.md
rename to explore-analyze/ai-features/agent-builder/get-started.md
diff --git a/solutions/search/agent-builder/images/agent-builder-agent-selector.png b/explore-analyze/ai-features/agent-builder/images/agent-builder-agent-selector.png
similarity index 100%
rename from solutions/search/agent-builder/images/agent-builder-agent-selector.png
rename to explore-analyze/ai-features/agent-builder/images/agent-builder-agent-selector.png
diff --git a/solutions/search/agent-builder/images/agent-builder-chat-UI-get-started.png b/explore-analyze/ai-features/agent-builder/images/agent-builder-chat-UI-get-started.png
similarity index 100%
rename from solutions/search/agent-builder/images/agent-builder-chat-UI-get-started.png
rename to explore-analyze/ai-features/agent-builder/images/agent-builder-chat-UI-get-started.png
diff --git a/solutions/search/agent-builder/images/agent-builder-chat-history.png b/explore-analyze/ai-features/agent-builder/images/agent-builder-chat-history.png
similarity index 100%
rename from solutions/search/agent-builder/images/agent-builder-chat-history.png
rename to explore-analyze/ai-features/agent-builder/images/agent-builder-chat-history.png
diff --git a/solutions/search/agent-builder/images/agent-builder-chat-input.png b/explore-analyze/ai-features/agent-builder/images/agent-builder-chat-input.png
similarity index 100%
rename from solutions/search/agent-builder/images/agent-builder-chat-input.png
rename to explore-analyze/ai-features/agent-builder/images/agent-builder-chat-input.png
diff --git a/solutions/search/agent-builder/images/chat-and-clone-buttons.png b/explore-analyze/ai-features/agent-builder/images/chat-and-clone-buttons.png
similarity index 100%
rename from solutions/search/agent-builder/images/chat-and-clone-buttons.png
rename to explore-analyze/ai-features/agent-builder/images/chat-and-clone-buttons.png
diff --git a/solutions/search/agent-builder/images/chat-edit-clone-delete.png b/explore-analyze/ai-features/agent-builder/images/chat-edit-clone-delete.png
similarity index 100%
rename from solutions/search/agent-builder/images/chat-edit-clone-delete.png
rename to explore-analyze/ai-features/agent-builder/images/chat-edit-clone-delete.png
diff --git a/solutions/search/agent-builder/images/copy-mcp-server-url-button.png b/explore-analyze/ai-features/agent-builder/images/copy-mcp-server-url-button.png
similarity index 100%
rename from solutions/search/agent-builder/images/copy-mcp-server-url-button.png
rename to explore-analyze/ai-features/agent-builder/images/copy-mcp-server-url-button.png
diff --git a/solutions/search/agent-builder/images/create-esql-tool-query.png b/explore-analyze/ai-features/agent-builder/images/create-esql-tool-query.png
similarity index 100%
rename from solutions/search/agent-builder/images/create-esql-tool-query.png
rename to explore-analyze/ai-features/agent-builder/images/create-esql-tool-query.png
diff --git a/solutions/search/agent-builder/images/new-agent-button.png b/explore-analyze/ai-features/agent-builder/images/new-agent-button.png
similarity index 100%
rename from solutions/search/agent-builder/images/new-agent-button.png
rename to explore-analyze/ai-features/agent-builder/images/new-agent-button.png
diff --git a/solutions/search/agent-builder/images/new-tool-button.png b/explore-analyze/ai-features/agent-builder/images/new-tool-button.png
similarity index 100%
rename from solutions/search/agent-builder/images/new-tool-button.png
rename to explore-analyze/ai-features/agent-builder/images/new-tool-button.png
diff --git a/solutions/search/agent-builder/images/save-and-chat-buttons.png b/explore-analyze/ai-features/agent-builder/images/save-and-chat-buttons.png
similarity index 100%
rename from solutions/search/agent-builder/images/save-and-chat-buttons.png
rename to explore-analyze/ai-features/agent-builder/images/save-and-chat-buttons.png
diff --git a/solutions/search/agent-builder/images/test-icon.png b/explore-analyze/ai-features/agent-builder/images/test-icon.png
similarity index 100%
rename from solutions/search/agent-builder/images/test-icon.png
rename to explore-analyze/ai-features/agent-builder/images/test-icon.png
diff --git a/solutions/search/agent-builder/images/token-usage-json-raw-response.png b/explore-analyze/ai-features/agent-builder/images/token-usage-json-raw-response.png
similarity index 100%
rename from solutions/search/agent-builder/images/token-usage-json-raw-response.png
rename to explore-analyze/ai-features/agent-builder/images/token-usage-json-raw-response.png
diff --git a/solutions/search/agent-builder/images/token-usage.png b/explore-analyze/ai-features/agent-builder/images/token-usage.png
similarity index 100%
rename from solutions/search/agent-builder/images/token-usage.png
rename to explore-analyze/ai-features/agent-builder/images/token-usage.png
diff --git a/solutions/search/agent-builder/images/tool-save-save-and-test-buttons.png b/explore-analyze/ai-features/agent-builder/images/tool-save-save-and-test-buttons.png
similarity index 100%
rename from solutions/search/agent-builder/images/tool-save-save-and-test-buttons.png
rename to explore-analyze/ai-features/agent-builder/images/tool-save-save-and-test-buttons.png
diff --git a/solutions/search/agent-builder/images/tools-overview.png b/explore-analyze/ai-features/agent-builder/images/tools-overview.png
similarity index 100%
rename from solutions/search/agent-builder/images/tools-overview.png
rename to explore-analyze/ai-features/agent-builder/images/tools-overview.png
diff --git a/solutions/search/agent-builder/kibana-api.md b/explore-analyze/ai-features/agent-builder/kibana-api.md
similarity index 100%
rename from solutions/search/agent-builder/kibana-api.md
rename to explore-analyze/ai-features/agent-builder/kibana-api.md
diff --git a/solutions/search/agent-builder/limitations-known-issues.md b/explore-analyze/ai-features/agent-builder/limitations-known-issues.md
similarity index 100%
rename from solutions/search/agent-builder/limitations-known-issues.md
rename to explore-analyze/ai-features/agent-builder/limitations-known-issues.md
diff --git a/solutions/search/agent-builder/mcp-server.md b/explore-analyze/ai-features/agent-builder/mcp-server.md
similarity index 96%
rename from solutions/search/agent-builder/mcp-server.md
rename to explore-analyze/ai-features/agent-builder/mcp-server.md
index fbe9011e0f..3ec9c31bb1 100644
--- a/solutions/search/agent-builder/mcp-server.md
+++ b/explore-analyze/ai-features/agent-builder/mcp-server.md
@@ -32,7 +32,7 @@ You can copy your MCP server URL directly in the Tools GUI. Refer to [](tools.md
 
 ## Configuring MCP clients
 
-Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you need to provide your Kibana URL and API key in the client's configuration file, typically in the following format:
+Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you need to provide your {{kib}} URL and API key in the client's configuration file, typically in the following format:
 
 ```json
 {
diff --git a/solutions/search/agent-builder/models.md b/explore-analyze/ai-features/agent-builder/models.md
similarity index 97%
rename from solutions/search/agent-builder/models.md
rename to explore-analyze/ai-features/agent-builder/models.md
index 874404548f..cfbad913c4 100644
--- a/solutions/search/agent-builder/models.md
+++ b/explore-analyze/ai-features/agent-builder/models.md
@@ -69,7 +69,7 @@ The following models are not compatible with {{agent-builder}}:
 
 - **OpenAI**: GPT-5-chat
 
-Learn more about [incompatible LLMs](/solutions/search/agent-builder/limitations-known-issues.md#incompatible-llms).
+Learn more about [incompatible LLMs](/explore-analyze/ai-features/agent-builder/limitations-known-issues.md#incompatible-llms).
 
 ### Why model quality matters
 
diff --git a/solutions/search/agent-builder/monitor-usage.md b/explore-analyze/ai-features/agent-builder/monitor-usage.md
similarity index 100%
rename from solutions/search/agent-builder/monitor-usage.md
rename to explore-analyze/ai-features/agent-builder/monitor-usage.md
diff --git a/solutions/search/agent-builder/permissions.md b/explore-analyze/ai-features/agent-builder/permissions.md
similarity index 100%
rename from solutions/search/agent-builder/permissions.md
rename to explore-analyze/ai-features/agent-builder/permissions.md
diff --git a/solutions/search/agent-builder/programmatic-access.md b/explore-analyze/ai-features/agent-builder/programmatic-access.md
similarity index 100%
rename from solutions/search/agent-builder/programmatic-access.md
rename to explore-analyze/ai-features/agent-builder/programmatic-access.md
diff --git a/solutions/search/agent-builder/tools.md b/explore-analyze/ai-features/agent-builder/tools.md
similarity index 99%
rename from solutions/search/agent-builder/tools.md
rename to explore-analyze/ai-features/agent-builder/tools.md
index d95e3af371..238a7a9d3d 100644
--- a/solutions/search/agent-builder/tools.md
+++ b/explore-analyze/ai-features/agent-builder/tools.md
@@ -191,7 +191,7 @@ Custom tools can be modified or removed as needed:
 2. Select the edit icon to update the tool or the delete icon to remove it.
 3. For updates, modify the tool properties and save your changes.
 
-Note that built-in tools cannot be modified or deleted.
+Built-in tools cannot be modified or deleted.
 
 ## Tools API
 
diff --git a/solutions/search/agent-builder/tools/esql-tools.md b/explore-analyze/ai-features/agent-builder/tools/esql-tools.md
similarity index 100%
rename from solutions/search/agent-builder/tools/esql-tools.md
rename to explore-analyze/ai-features/agent-builder/tools/esql-tools.md
diff --git a/solutions/search/agent-builder/tools/index-search-tools.md b/explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
similarity index 98%
rename from solutions/search/agent-builder/tools/index-search-tools.md
rename to explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
index 64c1fc36e6..601c0b7af5 100644
--- a/solutions/search/agent-builder/tools/index-search-tools.md
+++ b/explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
@@ -20,7 +20,7 @@ Use custom **Index search tools** when:
 
 * You want agents to handle diverse, exploratory queries
 * The search intent varies significantly across requests
-* Users need flexible, ad-hoc search functionality
+* Users need flexible, dynamic search functionality
 * You want to scope general search capabilities to specific indices
 
 ## Key characteristics
diff --git a/solutions/search/elastic-agent-builder.md b/explore-analyze/ai-features/elastic-agent-builder.md
similarity index 100%
rename from solutions/search/elastic-agent-builder.md
rename to explore-analyze/ai-features/elastic-agent-builder.md
diff --git a/explore-analyze/toc.yml b/explore-analyze/toc.yml
index b2539da2ff..b9da3351e1 100644
--- a/explore-analyze/toc.yml
+++ b/explore-analyze/toc.yml
@@ -170,6 +170,24 @@ toc:
       - file: cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
   - file: ai-features.md
     children:
+      - file: ai-features/elastic-agent-builder.md
+        children:
+          - file: ai-features/agent-builder/get-started.md
+          - file: ai-features/agent-builder/models.md
+          - file: ai-features/agent-builder/chat.md
+          - file: ai-features/agent-builder/agent-builder-agents.md
+          - file: ai-features/agent-builder/tools.md
+            children:
+              - file: ai-features/agent-builder/tools/esql-tools.md
+              - file: ai-features/agent-builder/tools/index-search-tools.md
+          - file: ai-features/agent-builder/programmatic-access.md
+            children:
+               - file: ai-features/agent-builder/kibana-api.md
+               - file: ai-features/agent-builder/a2a-server.md
+               - file: ai-features/agent-builder/mcp-server.md
+          - file: ai-features/agent-builder/monitor-usage.md
+          - file: ai-features/agent-builder/permissions.md
+          - file: ai-features/agent-builder/limitations-known-issues.md
       - file: ai-features/ai-assistant.md
       - file: ai-features/manage-access-to-ai-assistant.md
       - file: ai-features/llm-guides/llm-connectors.md
diff --git a/redirects.yml b/redirects.yml
index 87913e0f31..f8a943414e 100644
--- a/redirects.yml
+++ b/redirects.yml
@@ -631,3 +631,20 @@ redirects:
   # Move CCS feature docs to explore-analyze
   'solutions/search/cross-cluster-search.md': 'explore-analyze/cross-cluster-search.md'
   'solutions/search/cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md': 'explore-analyze/cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md'
+
+  # Related to agent builder restructure - moved agent builder docs to explore-analyze/
+  'solutions/search/elastic-agent-builder.md': 'explore-analyze/ai-features/elastic-agent-builder.md'
+  'solutions/search/agent-builder/tools/esql-tools.md': 'explore-analyze/ai-features/agent-builder/tools/esql-tools.md'
+  'solutions/search/agent-builder/tools/index-search-tools.md': 'explore-analyze/ai-features/agent-builder/tools/index-search-tools.md'
+  'solutions/search/agent-builder/a2a-server.md': 'explore-analyze/ai-features/agent-builder/a2a-server.md'
+  'solutions/search/agent-builder/agent-builder-agents.md': 'explore-analyze/ai-features/agent-builder/agent-builder-agents.md'
+  'solutions/search/agent-builder/chat.md': 'explore-analyze/ai-features/agent-builder/chat.md'
+  'solutions/search/agent-builder/get-started.md': 'explore-analyze/ai-features/agent-builder/get-started.md'
+  'solutions/search/agent-builder/kibana-api.md': 'explore-analyze/ai-features/agent-builder/kibana-api.md'
+  'solutions/search/agent-builder/limitations-known-issues.md': 'explore-analyze/ai-features/agent-builder/limitations-known-issues.md'
+  'solutions/search/agent-builder/mcp-server.md': 'explore-analyze/ai-features/agent-builder/mcp-server.md'
+  'solutions/search/agent-builder/models.md': 'explore-analyze/ai-features/agent-builder/models.md'
+  'solutions/search/agent-builder/monitor-usage.md': 'explore-analyze/ai-features/agent-builder/monitor-usage.md'
+  'solutions/search/agent-builder/permissions.md': 'explore-analyze/ai-features/agent-builder/permissions.md'
+  'solutions/search/agent-builder/programmatic-access.md': 'explore-analyze/ai-features/agent-builder/programmatic-access.md'
+  'solutions/search/agent-builder/tools.md': 'explore-analyze/ai-features/agent-builder/tools.md'
\ No newline at end of file
diff --git a/release-notes/elastic-cloud-serverless/index.md b/release-notes/elastic-cloud-serverless/index.md
index 48a396cdf5..fe5ee3c337 100644
--- a/release-notes/elastic-cloud-serverless/index.md
+++ b/release-notes/elastic-cloud-serverless/index.md
@@ -629,7 +629,7 @@ Review the changes, fixes, and more to {{serverless-full}}.
 
 ### Features and enhancements [serverless-changelog-10202025-features-enhancements]
 
-* [Agent Builder](/solutions/search/elastic-agent-builder.md) is now available in technical preview and is enabled by default on {{serverless-full}}
+* [Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) is now available in technical preview and is enabled by default on {{serverless-full}}
 * Lets you remove root privileges from {{fleet}} managed agents [#237790]({{kib-pull}}237790)
 * Adds the `xpack.fleet.experimentalFeatures` setting [#238840]({{kib-pull}}238840)
 * Supports expression suggestions within function parameters [#236343]({{kib-pull}}236343)
diff --git a/solutions/search/apis-and-tools.md b/solutions/search/apis-and-tools.md
index aa7ee1d26e..059f1a6440 100644
--- a/solutions/search/apis-and-tools.md
+++ b/solutions/search/apis-and-tools.md
@@ -67,7 +67,7 @@ These tools are documented in the **Explore & Analyze** section:
 [Elastic Search UI](./site-or-app/search-ui.md) is a library of JavaScript and React tools for building search experiences, optimized for use with {{es}}.
 
 :::{tip}
-Check out the Elasticsearch Labs [blog](https://www.elastic.co/search-labs) to learn how to use Elastic to build advanced search experiences including generative AI, embedding models, reranking capabilities and more.
+Check out the {{es}} Labs [blog](https://www.elastic.co/search-labs) to learn how to use Elastic to build advanced search experiences including generative AI, embedding models, reranking capabilities and more.
 
 The accompanying [GitHub repository](https://www.github.com/elastic/elasticsearch-labs) contains hands-on Python notebooks and sample apps to help you get started with these advanced search features.
 :::
@@ -76,7 +76,7 @@ The accompanying [GitHub repository](https://www.github.com/elastic/elasticsearc
 
 ### Agent Builder
 
-[Agent Builder](elastic-agent-builder.md) enables you to create AI agents that can interact with your Elasticsearch data, execute queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
+[Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) enables you to create AI agents that can interact with your {{es}} data, execute queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
 
 ### Playground
 
diff --git a/solutions/search/mcp.md b/solutions/search/mcp.md
index 5be6626170..094aa342b2 100644
--- a/solutions/search/mcp.md
+++ b/solutions/search/mcp.md
@@ -14,7 +14,7 @@ Elastic offers two MCP server options for connecting agents to your {{es}} data.
 stack: preview 9.2
 serverless: preview
 ```
-Elastic 9.2.0+ and Serverless deployments provide an [Agent Builder MCP server endpoint](https://www.elastic.co/docs/solutions/search/agent-builder/mcp-server) that exposes all built-in and custom [tools](https://www.elastic.co/docs/solutions/search/agent-builder/tools) you can use to power agentic workflows.
+Elastic 9.2.0+ and Serverless deployments provide an [Agent Builder MCP server endpoint](https://www.elastic.co/docs/solutions/explore-analyze/ai-features/agent-builder/mcp-server) that exposes all built-in and custom [tools](https://www.elastic.co/docs/solutions/explore-analyze/ai-features/agent-builder/tools) you can use to power agentic workflows.
 
 ## {{es}} MCP server
 
diff --git a/solutions/security/advanced-entity-analytics/view-entity-details.md b/solutions/security/advanced-entity-analytics/view-entity-details.md
index 35bd43a67a..b164c1b7d9 100644
--- a/solutions/security/advanced-entity-analytics/view-entity-details.md
+++ b/solutions/security/advanced-entity-analytics/view-entity-details.md
@@ -55,7 +55,7 @@ The summary provides a consolidated view of the entity's security posture, helpi
 * Recommended next steps based on the entity's security posture, such as updating vulnerable packages, investigating specific alerts, or implementing additional security controls
 
 ::::{tip}
-If you have [AI Assistant](/solutions/security/ai/ai-assistant.md) or [Agent Builder](/solutions/search/elastic-agent-builder.md) set up, you can select **More actions** ({icon}`boxes_vertical`) → **Ask AI Assistant** or **Add to chat** to continue the conversation about the entity in AI Assistant or Agent Builder.
+If you have [AI Assistant](/solutions/security/ai/ai-assistant.md) or [Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) set up, you can select **More actions** ({icon}`boxes_vertical`) → **Ask AI Assistant** or **Add to chat** to continue the conversation about the entity in AI Assistant or Agent Builder.
 ::::
 
 :::{image} /solutions/images/security-entity-summary.png
diff --git a/solutions/toc.yml b/solutions/toc.yml
index 344a9dea5f..a1ab47821c 100644
--- a/solutions/toc.yml
+++ b/solutions/toc.yml
@@ -62,24 +62,6 @@ toc:
           - file: search/esql-for-search.md
           - file: search/retrievers-overview.md
           - file: search/search-templates.md
-      - file: search/elastic-agent-builder.md
-        children:
-          - file: search/agent-builder/get-started.md
-          - file: search/agent-builder/models.md
-          - file: search/agent-builder/chat.md
-          - file: search/agent-builder/agent-builder-agents.md
-          - file: search/agent-builder/tools.md
-            children:
-              - file: search/agent-builder/tools/esql-tools.md
-              - file: search/agent-builder/tools/index-search-tools.md
-          - file: search/agent-builder/programmatic-access.md
-            children:
-              - file: search/agent-builder/kibana-api.md
-              - file: search/agent-builder/a2a-server.md
-              - file: search/agent-builder/mcp-server.md
-          - file: search/agent-builder/monitor-usage.md
-          - file: search/agent-builder/permissions.md
-          - file: search/agent-builder/limitations-known-issues.md
       - file: search/rag.md
         children:
           - file: search/rag/playground.md