diff --git a/deploy-manage/deploy/cloud-enterprise/ece-ha.md b/deploy-manage/deploy/cloud-enterprise/ece-ha.md
index ba5b7c3cba..32d12aed77 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-ha.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-ha.md
@@ -53,7 +53,7 @@ Backing up Zookeeper data directory is also recommended. Refer to [rebuilding a
 
 ## External resources accessibility
 
-If you’re using a [private Docker registry server](ece-install-offline-with-registry.md) or hosting any [custom bundles and plugins](../../../solutions/search/full-text/search-with-synonyms.md) on a web server, make sure these resources are accessible from all ECE allocators, so they can continue to be accessed in the event of a network partition or zone outage.
+If you're using a [private Docker registry server](ece-install-offline-with-registry.md) or hosting any [custom bundles and plugins](/solutions/search/full-text/search-with-synonyms.md) on a web server, make sure these resources are accessible from all ECE allocators, so they can continue to be accessed in the event of a network partition or zone outage.
 
 ## Other recommendations
 
diff --git a/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md b/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
index 2f5232e795..441eac2f80 100644
--- a/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
+++ b/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
@@ -98,7 +98,7 @@ This table compares Elasticsearch capabilities between {{ech}} deployments and S
 | **Repository management** | ✅ | Managed | Automatically managed by Elastic |
 | [**Scripted metric aggregations**](elasticsearch://reference/aggregations/search-aggregations-metrics-scripted-metric-aggregation.md) | ✅ | ❌ | Not available in Serverless<br>The alternative for this in Serverless is [ES|QL](elasticsearch://reference/query-languages/esql.md) |
 | [**`join` fields**](elasticsearch://reference/elasticsearch/mapping-reference/parent-join.md) | ✅ | ❌ | Not available in Serverless<br>The alternative for this in Serverless is the ES\|QL [`LOOKUP JOIN`](elasticsearch://reference/query-languages/esql/commands/lookup-join.md) command |
-| [**Search applications**](/solutions/search/search-applications.md) | - UI and APIs <br>- Maintenance mode (beta) | - API-only <br>- Maintenance mode (beta) | UI not available in Serverless |
+| [**Search applications**](/solutions/elasticsearch-solution-project/search-applications.md) | - UI and APIs <br>- Maintenance mode (beta) | - API-only <br>- Maintenance mode (beta) | UI not available in Serverless |
 | **Shard management** | User-configurable | Managed by Elastic | No manual shard allocation in Serverless |
 | [**Watcher**](/explore-analyze/alerts-cases/watcher.md) | ✅ | ❌ | Use **Kibana Alerts** instead, which provides rich integrations across use cases |
 | **Web crawler** | ❌ (Managed Elastic Crawler discontinued with Enterprise Search in 9.0) | Self-managed only | Use [**self-managed crawler**](https://github.com/elastic/crawler) |
diff --git a/deploy-manage/reference-architectures/hotfrozen-high-availability.md b/deploy-manage/reference-architectures/hotfrozen-high-availability.md
index f24c976a02..bdefcb1d92 100644
--- a/deploy-manage/reference-architectures/hotfrozen-high-availability.md
+++ b/deploy-manage/reference-architectures/hotfrozen-high-availability.md
@@ -27,7 +27,7 @@ This Hot/Frozen – High Availability architecture is intended for organizations
 * Have a requirement for cost effective long term data storage (many months or years).
 * Provide insights and alerts using logs, metrics, traces, or various event types to ensure optimal performance and quick issue resolution for applications.
 * Apply [machine learning anomaly detection](/explore-analyze/machine-learning/anomaly-detection.md) to help detect patterns in time series data to find root cause and resolve problems faster.
-* Use an AI assistant ([Observability](/explore-analyze/ai-features/ai-assistant.md), [Security](/solutions/security/ai/ai-assistant.md), or [Playground](/solutions/search/rag/playground.md)) for investigation, incident response, reporting, query generation, or query conversion from other languages using natural language.
+* Use an AI assistant ([Observability](/explore-analyze/ai-features/ai-assistant.md), [Security](/solutions/security/ai/ai-assistant.md), or [Playground](/solutions/elasticsearch-solution-project/playground.md)) for investigation, incident response, reporting, query generation, or query conversion from other languages using natural language.
 * Deploy an architecture model that allows for maximum flexibility between storage cost and performance.
 
 ::::{important}
diff --git a/explore-analyze/ai-features.md b/explore-analyze/ai-features.md
index 41789681d3..2d53f8605d 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](/solutions/elasticsearch-solution-project/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}}
 
@@ -79,11 +79,11 @@ The [{{es}}](/solutions/search.md) solution view (or project type in {{serverles
 
 ### Playground
 
-[Playground](/solutions/search/rag/playground.md) enables you to use large language models (LLMs) to understand, explore, and analyze your {{es}} data using retrieval augmented generation (RAG), via a chat interface. Playground is also very useful for testing and debugging your {{es}} queries, using the [retrievers](/solutions/search/retrievers-overview.md) syntax with the `_search` endpoint.
+[Playground](/solutions/elasticsearch-solution-project/playground.md) enables you to use large language models (LLMs) to understand, explore, and analyze your {{es}} data using retrieval augmented generation (RAG), via a chat interface. Playground is also very useful for testing and debugging your {{es}} queries, using the [retrievers](/solutions/search/retrievers-overview.md) syntax with the `_search` endpoint.
 
 ### Model context protocol
 
-The [Model Context Protocol (MCP)](/solutions/search/mcp.md) lets you connect AI agents and assistants to your {{es}} data to enable natural language interactions with your indices.
+The [Model Context Protocol (MCP)](/solutions/elasticsearch-solution-project/mcp.md) lets you connect AI agents and assistants to your {{es}} data to enable natural language interactions with your indices.
 
 ## AI-powered features in {{observability}}
 
diff --git a/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md b/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
index 51ac0e20ca..dbba4e7285 100644
--- a/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
+++ b/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
@@ -25,7 +25,7 @@ This feature is not available at all Elastic subscription levels. Refer to the E
 
 ### ELSER text expansion [ingest-pipeline-search-inference-elser]
 
-Using Elastic’s [ELSER machine learning model](../nlp/ml-nlp-elser.md) you can easily incorporate text expansion for your queries. This works by using ELSER to provide semantic enrichments to your documents upon ingestion, combined with the power of [Elastic Search Application templates](../../../solutions/search/search-applications.md) to provide automated text expansion at query time.
+Using Elastic's [ELSER machine learning model](../nlp/ml-nlp-elser.md) you can easily incorporate text expansion for your queries. This works by using ELSER to provide semantic enrichments to your documents upon ingestion, combined with the power of [Elastic Search Application templates](/solutions/elasticsearch-solution-project/search-applications.md) to provide automated text expansion at query time.
 
 ### Named entity recognition (NER) [ingest-pipeline-search-inference-ner]
 
diff --git a/explore-analyze/query-filter/tools/playground.md b/explore-analyze/query-filter/tools/playground.md
index 8dedbcc4cd..c86468593b 100644
--- a/explore-analyze/query-filter/tools/playground.md
+++ b/explore-analyze/query-filter/tools/playground.md
@@ -16,6 +16,6 @@ Use the Search Playground to test and edit {{es}} queries visually in the UI. Th
 Find Playground in the {{es-serverless}} UI under **{{es}} > Build > Playground**.
 
 ::::{note}
-ℹ️ For more details, check the full [Playground documentation](../../../solutions/search/rag/playground.md).
+ℹ️ For more details, check the full [Playground documentation](/solutions/elasticsearch-solution-project/playground.md).
 
 ::::
diff --git a/get-started/evaluate-elastic.md b/get-started/evaluate-elastic.md
index 81da74b59c..298141b7ad 100644
--- a/get-started/evaluate-elastic.md
+++ b/get-started/evaluate-elastic.md
@@ -172,7 +172,7 @@ Once data is flowing, use the trial to validate the features that will determine
 | Feature | Why it matters | How to try it |
 |---------|----------------|---------------|
 | Vector search and hybrid search | Combine semantic understanding with keyword precision | [Semantic search quickstart](/solutions/search/get-started/semantic-search.md) |
-| Relevance tuning | Ensure users find the most relevant results | [Query rules](/solutions/search/query-rules-ui.md) |
+| Relevance tuning | Ensure users find the most relevant results | [Query rules](/solutions/elasticsearch-solution-project/query-rules-ui.md) |
 | Search analytics | Understand what users search for and what they find | [Search relevance](/solutions/search/full-text/search-relevance.md) |
 | Performance at scale | Validate response times with production-like volumes | Index a representative dataset and benchmark queries |
 
diff --git a/get-started/introduction.md b/get-started/introduction.md
index 26fc8d969a..98c573f730 100644
--- a/get-started/introduction.md
+++ b/get-started/introduction.md
@@ -17,7 +17,7 @@ Whether you're building a search experience, monitoring your infrastructure, or
 
 | Your need | Recommended solution | Best for |
 |-----------|-------------------|----------|
-| Build powerful, scalable searches to quickly search, analyze, and visualize large amounts of data for real-time insights| [{{es}}](/solutions/search.md)<br>• [Get started](/solutions/search/get-started.md)| Developers, architects, data engineers |
+| Build powerful, scalable searches to quickly search, analyze, and visualize large amounts of data for real-time insights| [{{es}}](/solutions/search.md)[^search-note]<br>• [Get started](/solutions/search/get-started.md)| Developers, architects, data engineers |
 | Observe and monitor system health and performance, or send telemetry data | [Elastic {{observability}}](/solutions/observability.md)<br>• [Get started](/solutions/observability/get-started.md) | DevOps, SREs, IT operations |
 | Monitor data for anomalous activity, detect, prevent, and respond to security incidents | [{{elastic-sec}}](/solutions/security.md)<br>• [Get started](/solutions/security/get-started.md)| SOC teams, security analysts, IT security admins |
 
@@ -29,6 +29,8 @@ Each of our solutions is available as a fully managed {{serverless-short}} proje
 
 If you're new to Elastic, you can find quickstarts and introductory steps for each solution within [](/solutions/index.md).
 
+[^search-note]: The core [{{es}} search capabilities](/solutions/search.md) are available across all deployment types, solutions, and project types through APIs and client libraries. The [{{es}} solution](/solutions/elasticsearch-solution-project.md) adds UI tools on top of these capabilities to help you build search applications faster.
+
 <!--
 ## {{es}}
 
diff --git a/redirects.yml b/redirects.yml
index 87913e0f31..df7933769a 100644
--- a/redirects.yml
+++ b/redirects.yml
@@ -1,4 +1,14 @@
 redirects:
+  # Search primitives moved from ES solution to Search use case
+  'solutions/elasticsearch-solution-project/full-text/search-with-synonyms.md': 'solutions/search/full-text/search-with-synonyms.md'
+  'solutions/elasticsearch-solution-project/full-text/create-update-synonyms-api-example.md': 'solutions/search/full-text/create-update-synonyms-api-example.md'
+  # ES solution pages moved from Search to ES solution
+  'solutions/search/agent-builder/get-started.md': 'solutions/elasticsearch-solution-project/agent-builder/get-started.md'
+  'solutions/search/elastic-agent-builder.md': 'solutions/elasticsearch-solution-project/elastic-agent-builder.md'
+  'solutions/search/query-rules-ui.md': 'solutions/elasticsearch-solution-project/query-rules-ui.md'
+  'solutions/search/search-applications.md': 'solutions/elasticsearch-solution-project/search-applications.md'
+  'solutions/search/search-applications/search-application-client.md': 'solutions/elasticsearch-solution-project/search-applications/search-application-client.md'
+  'solutions/search/search-connection-details.md': 'solutions/elasticsearch-solution-project/search-connection-details.md'
   'deploy-manage/security/secure-http-communications.md': '!deploy-manage/security/secure-cluster-communications.md'
   'deploy-manage/security/manually-configure-security-in-self-managed-cluster.md': '!deploy-manage/security/self-setup.md'
   'deploy-manage/security/security-certificates-keys.md': '!deploy-manage/security/self-auto-setup.md'
@@ -355,7 +365,7 @@ redirects:
   'troubleshoot/observability/apm-agent-swift/apm-ios-agent.md': 'troubleshoot/ingest/opentelemetry/edot-sdks/ios/index.md'
 
 # Related to https://github.com/elastic/docs-content/pull/2843
-  'solutions/search/serverless-elasticsearch-get-started.md': 'solutions/search/get-started.md'
+  'solutions/search/serverless-elasticsearch-get-started.md': 'solutions/elasticsearch-solution-project/get-started.md'
 
 # Related to https://github.com/elastic/docs-content/pull/3032
   'manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md': 'manage-data/lifecycle/index-lifecycle-management/ilm-tutorials.md'
diff --git a/reference/elasticsearch-clients/index.md b/reference/elasticsearch-clients/index.md
index 79b3ed32c1..723259f0ea 100644
--- a/reference/elasticsearch-clients/index.md
+++ b/reference/elasticsearch-clients/index.md
@@ -22,5 +22,5 @@ products:
 - [Rust](elasticsearch-rs://reference/index.md)
 
 ::::{tip}
-Learn how to [connect to your {{es}} endpoint](/solutions/search/search-connection-details.md).
+Learn how to [connect to your {{es}} endpoint](/solutions/elasticsearch-solution-project/search-connection-details.md).
 ::::
diff --git a/release-notes/elastic-cloud-serverless/index.md b/release-notes/elastic-cloud-serverless/index.md
index 7d8ad1a753..3f5030415a 100644
--- a/release-notes/elastic-cloud-serverless/index.md
+++ b/release-notes/elastic-cloud-serverless/index.md
@@ -431,7 +431,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](/solutions/elasticsearch-solution-project/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/elasticsearch-solution-project.md b/solutions/elasticsearch-solution-project.md
new file mode 100644
index 0000000000..28ecb9de8f
--- /dev/null
+++ b/solutions/elasticsearch-solution-project.md
@@ -0,0 +1,66 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/what-is-elasticsearch-serverless.html
+  - https://www.elastic.co/guide/en/kibana/current/search-space.html
+applies_to:
+  stack:
+  serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
+  - id: kibana
+navigation_title: Elasticsearch solution
+---
+
+# {{es}} solution overview
+
+The {{es}} solution and serverless project type provide specialized UI tools that help you build search applications faster. The solution is an optional complement to the core {{es}} [search capabilities](/solutions/search.md) which are available through APIs across all deployment types, solutions, and project types.[^api-note]
+
+These UI affordances are exclusive to the {{es}} solution (on non-serverless deployments) and the {{es}} serverless project type.
+
+::::{tip}
+Not sure which deployment type is right for you? Use the following resources to help you decide:
+
+- Read the Elastic [deployment types overview](/deploy-manage/deploy.md)
+- Compare [serverless and {{ech}}](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md)
+  - Compare pricing models between [Elastic Cloud](/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md) and [Serverless](/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md)
+::::
+
+
+## Features and tools
+
+The {{es}} solution provides the following specialized UI tools and features to help you build search applications faster:
+
+### Agent Builder
+
+[Agent Builder](/solutions/elasticsearch-solution-project/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
+
+[Playground](/solutions/elasticsearch-solution-project/playground.md) lets you use large language models (LLMs) to understand, explore, and analyze your {{es}} data using retrieval augmented generation (RAG), via a chat interface. Playground is also useful for testing and debugging your {{es}} queries using the [retrievers](/solutions/search/retrievers-overview.md) syntax.
+
+### Synonyms UI
+
+The [synonyms UI](/solutions/search/full-text/search-with-synonyms.md#method-1-kib-ui) enables managing synonym sets directly within {{kib}}. This makes it easier to improve search relevance without editing configuration files.
+
+### Query Rules UI
+
+The [Query Rules UI](/solutions/elasticsearch-solution-project/query-rules-ui.md) enables you to create and manage query rules that modify search behavior based on specific conditions, helping you deliver more relevant results for common queries.
+
+### Model Context Protocol (MCP)
+
+The [Model Context Protocol (MCP)](/solutions/elasticsearch-solution-project/mcp.md) lets you connect AI agents and assistants to your {{es}} data to enable natural language interactions with your indices.
+
+## Get started
+
+Ready to start using the {{es}} solution? Refer to [Get started](/solutions/elasticsearch-solution-project/get-started.md) for setup instructions and quickstart guides.
+
+For a deeper understanding of search concepts and techniques, refer to the [Search use case](/solutions/search.md) documentation.
+
+## Related reference
+
+* [Search use case documentation](/solutions/search.md)
+* [{{es}} reference documentation](elasticsearch://reference/elasticsearch/index.md)
+* [{{es}} API documentation]({{es-apis}})
+
+[^api-note]: Certain APIs are not available on serverless deployments because they are fully managed by Elastic. Refer to [Available Elasticsearch APIs](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md#elasticsearch-differences-serverless-apis-availability) for details.
diff --git a/solutions/search/agent-builder/_snippets/spaces-api-note.md b/solutions/elasticsearch-solution-project/agent-builder/_snippets/spaces-api-note.md
similarity index 100%
rename from solutions/search/agent-builder/_snippets/spaces-api-note.md
rename to solutions/elasticsearch-solution-project/agent-builder/_snippets/spaces-api-note.md
diff --git a/solutions/search/agent-builder/a2a-server.md b/solutions/elasticsearch-solution-project/agent-builder/a2a-server.md
similarity index 100%
rename from solutions/search/agent-builder/a2a-server.md
rename to solutions/elasticsearch-solution-project/agent-builder/a2a-server.md
diff --git a/solutions/search/agent-builder/agent-builder-agents.md b/solutions/elasticsearch-solution-project/agent-builder/agent-builder-agents.md
similarity index 100%
rename from solutions/search/agent-builder/agent-builder-agents.md
rename to solutions/elasticsearch-solution-project/agent-builder/agent-builder-agents.md
diff --git a/solutions/search/agent-builder/chat.md b/solutions/elasticsearch-solution-project/agent-builder/chat.md
similarity index 100%
rename from solutions/search/agent-builder/chat.md
rename to solutions/elasticsearch-solution-project/agent-builder/chat.md
diff --git a/solutions/search/agent-builder/get-started.md b/solutions/elasticsearch-solution-project/agent-builder/get-started.md
similarity index 92%
rename from solutions/search/agent-builder/get-started.md
rename to solutions/elasticsearch-solution-project/agent-builder/get-started.md
index 3e5c393661..45d8a6ac9c 100644
--- a/solutions/search/agent-builder/get-started.md
+++ b/solutions/elasticsearch-solution-project/agent-builder/get-started.md
@@ -13,9 +13,9 @@ applies_to:
 Learn how to get started by enabling the {{agent-builder}} features and begin chatting with your data.
 
 ::::::{stepper}
-::::{step} Set up an Elastic deployment
+::::{step} Set up an {{es}} deployment
 
-If you don't already have an Elastic deployment, refer to [Select your deployment type](/solutions/search/get-started.md#choose-your-deployment-type).
+If you don't already have an {{es}} deployment, refer to [Get started with search](/solutions/search/get-started.md).
 
 :::{note}
 For {{ech}} deployments, make sure you are using the solution navigation instead of classic navigation.
@@ -68,7 +68,7 @@ For a broader overview of ingestion options, go to [](/manage-data/ingest.md).
 :::{tip}
 If you're not ready to add your own data, you can:
 - Use the Elastic [sample data](/manage-data/ingest/sample-data.md).
-- Generate synthetic financial data using [this Python tool](https://github.com/jeffvestal/synthetic-financial-data?tab=readme-ov-file#synthetic-financial-data-generator-).  (This requires your [{{es}} URL and an API key](/solutions/search/search-connection-details.md)).
+- Generate synthetic financial data using [this Python tool](https://github.com/jeffvestal/synthetic-financial-data?tab=readme-ov-file#synthetic-financial-data-generator-).  (This requires your [{{es}} URL and an API key](/solutions/elasticsearch-solution-project/search-connection-details.md)).
 
 % TODO: we can link to a an agent builder tutorial if we add one in the docs
 :::
diff --git a/solutions/search/agent-builder/images/agent-builder-agent-selector.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/agent-builder-agent-selector.png
diff --git a/solutions/search/agent-builder/images/agent-builder-chat-UI-get-started.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/agent-builder-chat-UI-get-started.png
diff --git a/solutions/search/agent-builder/images/agent-builder-chat-history.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/agent-builder-chat-history.png
diff --git a/solutions/search/agent-builder/images/agent-builder-chat-input.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/agent-builder-chat-input.png
diff --git a/solutions/search/agent-builder/images/chat-and-clone-buttons.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/chat-and-clone-buttons.png
diff --git a/solutions/search/agent-builder/images/chat-edit-clone-delete.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/chat-edit-clone-delete.png
diff --git a/solutions/search/agent-builder/images/copy-mcp-server-url-button.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/copy-mcp-server-url-button.png
diff --git a/solutions/search/agent-builder/images/create-esql-tool-query.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/create-esql-tool-query.png
diff --git a/solutions/search/agent-builder/images/new-agent-button.png b/solutions/elasticsearch-solution-project/agent-builder/images/new-agent-button.png
similarity index 100%
rename from solutions/search/agent-builder/images/new-agent-button.png
rename to solutions/elasticsearch-solution-project/agent-builder/images/new-agent-button.png
diff --git a/solutions/search/agent-builder/images/new-tool-button.png b/solutions/elasticsearch-solution-project/agent-builder/images/new-tool-button.png
similarity index 100%
rename from solutions/search/agent-builder/images/new-tool-button.png
rename to solutions/elasticsearch-solution-project/agent-builder/images/new-tool-button.png
diff --git a/solutions/search/agent-builder/images/save-and-chat-buttons.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/save-and-chat-buttons.png
diff --git a/solutions/search/agent-builder/images/test-icon.png b/solutions/elasticsearch-solution-project/agent-builder/images/test-icon.png
similarity index 100%
rename from solutions/search/agent-builder/images/test-icon.png
rename to solutions/elasticsearch-solution-project/agent-builder/images/test-icon.png
diff --git a/solutions/search/agent-builder/images/tool-save-save-and-test-buttons.png b/solutions/elasticsearch-solution-project/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 solutions/elasticsearch-solution-project/agent-builder/images/tool-save-save-and-test-buttons.png
diff --git a/solutions/search/agent-builder/images/tools-overview.png b/solutions/elasticsearch-solution-project/agent-builder/images/tools-overview.png
similarity index 100%
rename from solutions/search/agent-builder/images/tools-overview.png
rename to solutions/elasticsearch-solution-project/agent-builder/images/tools-overview.png
diff --git a/solutions/search/agent-builder/kibana-api.md b/solutions/elasticsearch-solution-project/agent-builder/kibana-api.md
similarity index 99%
rename from solutions/search/agent-builder/kibana-api.md
rename to solutions/elasticsearch-solution-project/agent-builder/kibana-api.md
index ddfe4ef52e..a666fe5f03 100644
--- a/solutions/search/agent-builder/kibana-api.md
+++ b/solutions/elasticsearch-solution-project/agent-builder/kibana-api.md
@@ -37,7 +37,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/tools" \
 ```
 :::{tip}
 To generate API keys, search for `API keys` in the [global search bar](/explore-analyze/find-and-organize/find-apps-and-objects.md).
-[Learn more](https://www.elastic.co/docs/solutions/search/search-connection-details).
+[Learn more](/solutions/elasticsearch-solution-project/search-connection-details.md).
 :::
 
 ### Working with Spaces
diff --git a/solutions/search/agent-builder/limitations-known-issues.md b/solutions/elasticsearch-solution-project/agent-builder/limitations-known-issues.md
similarity index 100%
rename from solutions/search/agent-builder/limitations-known-issues.md
rename to solutions/elasticsearch-solution-project/agent-builder/limitations-known-issues.md
diff --git a/solutions/search/agent-builder/mcp-server.md b/solutions/elasticsearch-solution-project/agent-builder/mcp-server.md
similarity index 95%
rename from solutions/search/agent-builder/mcp-server.md
rename to solutions/elasticsearch-solution-project/agent-builder/mcp-server.md
index fbe9011e0f..7c7fb9fe6a 100644
--- a/solutions/search/agent-builder/mcp-server.md
+++ b/solutions/elasticsearch-solution-project/agent-builder/mcp-server.md
@@ -63,7 +63,7 @@ export KIBANA_URL="your-kibana-url"
 export API_KEY="your-api-key"
 ```
 
-For information on generating API keys, refer to [API keys](https://www.elastic.co/docs/solutions/search/search-connection-details).
+For information on generating API keys, refer to [](/deploy-manage/api-keys/serverless-project-api-keys.md).
 
 Tools execute with the scope assigned to the API key. Make sure your API key has the appropriate permissions to only access the indices and data that you want to expose through the MCP server. To learn more, refer to [](#api-key-application-privileges).
 :::
diff --git a/solutions/search/agent-builder/models.md b/solutions/elasticsearch-solution-project/agent-builder/models.md
similarity index 96%
rename from solutions/search/agent-builder/models.md
rename to solutions/elasticsearch-solution-project/agent-builder/models.md
index 874404548f..c8d5969cfa 100644
--- a/solutions/search/agent-builder/models.md
+++ b/solutions/elasticsearch-solution-project/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](/solutions/elasticsearch-solution-project/agent-builder/limitations-known-issues.md#incompatible-llms).
 
 ### Why model quality matters
 
diff --git a/solutions/search/agent-builder/permissions.md b/solutions/elasticsearch-solution-project/agent-builder/permissions.md
similarity index 100%
rename from solutions/search/agent-builder/permissions.md
rename to solutions/elasticsearch-solution-project/agent-builder/permissions.md
diff --git a/solutions/search/agent-builder/programmatic-access.md b/solutions/elasticsearch-solution-project/agent-builder/programmatic-access.md
similarity index 100%
rename from solutions/search/agent-builder/programmatic-access.md
rename to solutions/elasticsearch-solution-project/agent-builder/programmatic-access.md
diff --git a/solutions/search/agent-builder/tools.md b/solutions/elasticsearch-solution-project/agent-builder/tools.md
similarity index 100%
rename from solutions/search/agent-builder/tools.md
rename to solutions/elasticsearch-solution-project/agent-builder/tools.md
diff --git a/solutions/search/agent-builder/tools/esql-tools.md b/solutions/elasticsearch-solution-project/agent-builder/tools/esql-tools.md
similarity index 100%
rename from solutions/search/agent-builder/tools/esql-tools.md
rename to solutions/elasticsearch-solution-project/agent-builder/tools/esql-tools.md
diff --git a/solutions/search/agent-builder/tools/index-search-tools.md b/solutions/elasticsearch-solution-project/agent-builder/tools/index-search-tools.md
similarity index 100%
rename from solutions/search/agent-builder/tools/index-search-tools.md
rename to solutions/elasticsearch-solution-project/agent-builder/tools/index-search-tools.md
diff --git a/solutions/search/ai-assistant.md b/solutions/elasticsearch-solution-project/ai-assistant.md
similarity index 100%
rename from solutions/search/ai-assistant.md
rename to solutions/elasticsearch-solution-project/ai-assistant.md
diff --git a/solutions/search/elastic-agent-builder.md b/solutions/elasticsearch-solution-project/elastic-agent-builder.md
similarity index 100%
rename from solutions/search/elastic-agent-builder.md
rename to solutions/elasticsearch-solution-project/elastic-agent-builder.md
diff --git a/solutions/elasticsearch-solution-project/get-started.md b/solutions/elasticsearch-solution-project/get-started.md
new file mode 100644
index 0000000000..d3fcf11594
--- /dev/null
+++ b/solutions/elasticsearch-solution-project/get-started.md
@@ -0,0 +1,102 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/getting-started.html
+  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-getting-started.html
+applies_to:
+  stack:
+  serverless:
+    elasticsearch: all
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
+navigation_title: Get started
+description: To try out an {{es}} project or solution, pick your deployment type, search goals, and ingestion method.
+---
+
+# Get started with the {{es}} solution/project type
+
+New to {{es}}? Start building a search experience by setting up your first deployment, refining your search goals, and adding data.
+
+:::{note}
+If you're looking for an introduction to the {{stack}} or the {{es}} product, go to [](/get-started/index.md) or [](/manage-data/data-store.md).
+:::
+
+::::::{stepper}
+:::::{step} Choose your deployment type
+
+Elastic provides several self-managed and Elastic-managed options.
+For simplicity and speed, try out {{es-serverless}}:
+
+::::{dropdown} Create an {{es-serverless}} project
+:::{include} /deploy-manage/deploy/_snippets/create-serverless-project-intro.md
+:::
+
+Choose the {{es}} project type and provide a name.
+You can optionally edit the project settings, such as the [region](/deploy-manage/deploy/elastic-cloud/regions.md).
+
+When your project is created, you're ready to move on to the next step and to start creating indices, adding data, and performing searches.
+::::
+
+Alternatively, create a [local development installation](/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md) in Docker:
+
+```sh
+curl -fsSL https://elastic.co/start-local | sh
+```
+
+Check out the full list of [deployment types](/deploy-manage/deploy.md#choosing-your-deployment-type) to learn more.
+:::::
+
+:::::{step} (Optional) Try out a quickstart
+
+Get hands-on experience with {{es}} using guided tutorials that walk you through common search scenarios:
+
+- [**Index and search basics**](/solutions/search/get-started/index-basics.md): Learn how to create indices, add documents, and perform searches
+- [**Keyword search with Python**](/solutions/search/get-started/keyword-search-python.md): Build your first search query with Python
+- [**Semantic search**](/solutions/search/get-started/semantic-search.md): Implement semantic search using embeddings
+:::::
+
+:::::{step} Identify your search goals
+Depending on your use case, you can choose multiple [search approaches](/solutions/search/search-approaches.md), for example full-text and semantic search.
+Each approach affects your options for storing and querying your data.
+
+If you're unsure which approaches match your goals, you can try them out with sample data. For example, [](/solutions/search/get-started/semantic-search.md).
+
+If you prefer to ingest your data first and transform or reindex it as needed later, skip to the next step.
+:::::
+:::::{step} Ingest your data
+
+If your goals include vector or semantic AI-powered search, create vectorized data with built-in and third-party natural language processing (NLP) models and store it in an {{es}} vector database.
+The approach that requires the least configuration involves adding `semantic_text` fields when ingesting your data.
+This method is described in [](/solutions/search/semantic-search/semantic-search-semantic-text.md).
+
+To learn about adding data for other search goals, go to [](/solutions/search/ingest-for-search.md).
+For a broader overview of ingestion options, go to [](/manage-data/ingest.md).
+
+If you're not ready to add your own data, you can use [sample data](/manage-data/ingest/sample-data.md) or create small data sets when you follow the instructions in the [quickstarts](/solutions/search/get-started/quickstarts.md).
+
+The {{es}} home page in the UI also provides workflow guides for creating indices and ready-to-use code examples for ingesting data by using REST APIs.
+:::::
+:::::{step} Build your search queries
+
+Your next steps will be to choose a method to write queries and interact with {{es}}.
+You can pick a programming language [client](/reference/elasticsearch-clients/index.md) that matches your application and choose which [query languages](/solutions/search/querying-for-search.md) you will use to express your search logic.
+Each decision builds on the previous ones, offering flexibility to mix and match approaches based on your needs.
+:::::
+
+:::::{step} Explore solution features
+
+The {{es}} solution provides additional UI tools on top of the core {{es}} capabilities, to help you build search applications:
+
+- [**Agent Builder**](/solutions/elasticsearch-solution-project/elastic-agent-builder.md): Create AI agents that interact with your {{es}} data
+- [**Query Rules UI**](/solutions/elasticsearch-solution-project/query-rules-ui.md): Create rules to modify search behavior
+- [**Search with synonyms**](/solutions/search/full-text/search-with-synonyms.md): Manage synonym sets through the UI
+:::::
+
+## Related resources
+
+Use these resources to learn more about {{es}} or get started in a different way:
+
+- [](/deploy-manage/deploy/deployment-comparison.md)
+- [Get started with Query DSL search and filters](elasticsearch://reference/query-languages/query-dsl/full-text-filter-tutorial.md)
+- [Get started with ES|QL queries](elasticsearch://reference/query-languages/esql/esql-getting-started.md)
+- [Analyze eCommerce data with aggregations using Query DSL](/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md)
diff --git a/solutions/search/mcp.md b/solutions/elasticsearch-solution-project/mcp.md
similarity index 81%
rename from solutions/search/mcp.md
rename to solutions/elasticsearch-solution-project/mcp.md
index 5be6626170..096de9365b 100644
--- a/solutions/search/mcp.md
+++ b/solutions/elasticsearch-solution-project/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](/solutions/elasticsearch-solution-project/agent-builder/mcp-server.md) that exposes all built-in and custom [tools](/solutions/elasticsearch-solution-project/agent-builder/tools.md) you can use to power agentic workflows.
 
 ## {{es}} MCP server
 
diff --git a/solutions/search/rag/playground-context.md b/solutions/elasticsearch-solution-project/playground-context.md
similarity index 100%
rename from solutions/search/rag/playground-context.md
rename to solutions/elasticsearch-solution-project/playground-context.md
diff --git a/solutions/search/rag/playground-query.md b/solutions/elasticsearch-solution-project/playground-query.md
similarity index 95%
rename from solutions/search/rag/playground-query.md
rename to solutions/elasticsearch-solution-project/playground-query.md
index 0c0f4e09ab..801277c2ff 100644
--- a/solutions/search/rag/playground-query.md
+++ b/solutions/elasticsearch-solution-project/playground-query.md
@@ -40,7 +40,7 @@ Remember that the next step in the workflow is to send the retrieved documents t
 [Troubleshooting](playground-troubleshooting.md) provides tips on how to diagnose and fix relevance issues.
 
 ::::{note}
-Playground uses the [`retriever`](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search#operation-search-body-application-json-retriever) syntax for {{es}} queries. Retrievers make it easier to compose and test different retrieval strategies in your search pipelines. Refer to [documentation](../querying-for-search.md) for a high level overview of retrievers.
+Playground uses the [`retriever`](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search#operation-search-body-application-json-retriever) syntax for {{es}} queries. Retrievers make it easier to compose and test different retrieval strategies in your search pipelines. Refer to [](/solutions/search/querying-for-search.md) for a high level overview of retrievers.
 
 ::::
 
diff --git a/solutions/search/rag/playground-troubleshooting.md b/solutions/elasticsearch-solution-project/playground-troubleshooting.md
similarity index 100%
rename from solutions/search/rag/playground-troubleshooting.md
rename to solutions/elasticsearch-solution-project/playground-troubleshooting.md
diff --git a/solutions/search/rag/playground.md b/solutions/elasticsearch-solution-project/playground.md
similarity index 97%
rename from solutions/search/rag/playground.md
rename to solutions/elasticsearch-solution-project/playground.md
index e71f767f6a..c3e8612ef4 100644
--- a/solutions/search/rag/playground.md
+++ b/solutions/elasticsearch-solution-project/playground.md
@@ -116,7 +116,7 @@ You can also use locally hosted LLMs that are compatible with the OpenAI SDK. On
 
 ### Connect to LLM provider [playground-getting-started-connect]
 
-To get started with Playground, you need to create a [connector](../../../deploy-manage/manage-connectors.md) for your LLM provider. By default, an Elastic Managed LLM is connected. You can also connect to [locally hosted LLMs](playground.md#playground-local-llms) which are compatible with the OpenAI API, by using the OpenAI connector.
+To get started with Playground, you need to create a [connector](/deploy-manage/manage-connectors.md) for your LLM provider. By default, an Elastic Managed LLM is connected. You can also connect to [locally hosted LLMs](playground.md#playground-local-llms) which are compatible with the OpenAI API, by using the OpenAI connector.
 
 To connect to an LLM provider, use the following steps on the Playground landing page:
 
diff --git a/solutions/search/query-rules-ui.md b/solutions/elasticsearch-solution-project/query-rules-ui.md
similarity index 100%
rename from solutions/search/query-rules-ui.md
rename to solutions/elasticsearch-solution-project/query-rules-ui.md
diff --git a/solutions/search/search-applications.md b/solutions/elasticsearch-solution-project/search-applications.md
similarity index 94%
rename from solutions/search/search-applications.md
rename to solutions/elasticsearch-solution-project/search-applications.md
index 426363cbb4..39f0348773 100644
--- a/solutions/search/search-applications.md
+++ b/solutions/elasticsearch-solution-project/search-applications.md
@@ -48,7 +48,7 @@ Managing search applications requires the `manage_search_application` cluster pr
 
 The {{es}} [Query DSL](../../explore-analyze/query-filter/languages/querydsl.md) is powerful and flexible, but it comes with a steep learning curve. Complex queries are verbose and hard to understand for non-experts. We’ve designed search applications to be easier to search over, but with the flexibility of working with an {{es}} index.
 
-Search Applications use [search templates](search-templates.md) to simplify the process of building queries. Templates are defined when creating a search application, and can be customized according to your needs. Read [Search API and templates](search-applications/search-application-api.md) for the details.
+Search Applications use [search templates](/solutions/search/search-templates.md) to simplify the process of building queries. Templates are defined when creating a search application, and can be customized according to your needs. Read [Search API and templates](search-applications/search-application-api.md) for the details.
 
 
 ## Get started [search-application-overview-get-started] 
diff --git a/solutions/search/search-applications/search-application-api.md b/solutions/elasticsearch-solution-project/search-applications/search-application-api.md
similarity index 96%
rename from solutions/search/search-applications/search-application-api.md
rename to solutions/elasticsearch-solution-project/search-applications/search-application-api.md
index 932a7ff3bb..4b8cfb91ef 100644
--- a/solutions/search/search-applications/search-application-api.md
+++ b/solutions/elasticsearch-solution-project/search-applications/search-application-api.md
@@ -14,7 +14,7 @@ products:
 # Search API and templates [search-application-api]
 
 
-Your [search applications](../search-applications.md) use [search templates](../search-templates.md) to perform searches. Templates help reduce complexity by exposing only template parameters, while using the full power of {{es}}'s query DSL to formulate queries. Templates may be set when creating or updating a search application, and can be customized. This template can be edited or updated at any time using the [Put Search Application API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-put) API call.
+Your [search applications](../search-applications.md) use [search templates](/solutions/search/search-templates.md) to perform searches. Templates help reduce complexity by exposing only template parameters, while using the full power of {{es}}'s query DSL to formulate queries. Templates may be set when creating or updating a search application, and can be customized. This template can be edited or updated at any time using the [Put Search Application API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-put) API call.
 
 In a nutshell, you create search templates with parameters instead of specific hardcoded search values. At search time, you pass in the actual values for these parameters, enabling customized searches without rewriting the entire query structure. Search Application templates:
 
@@ -27,7 +27,7 @@ This document provides information and sample templates to get you started using
 ::::{tip}
 Search templates use the [Mustache](https://mustache.github.io/) templating language. Mustache variables are typically enclosed in double curly brackets like this: `{{my-var}}`.
 
-Learn more by reading about [search templates](../search-templates.md).
+Learn more by reading about [search templates](/solutions/search/search-templates.md).
 
 ::::
 
@@ -603,7 +603,7 @@ POST _application/search_application/my_search_application/_search
 
 ### kNN search [search-applications-knn-template]
 
-This example supports [k-nearest neighbor (kNN) search](../vector/knn.md).
+This example supports [k-nearest neighbor (kNN) search](/solutions/search/vector/knn.md).
 
 A template supporting exact kNN search will look like the following example:
 
diff --git a/solutions/search/search-applications/search-application-client.md b/solutions/elasticsearch-solution-project/search-applications/search-application-client.md
similarity index 100%
rename from solutions/search/search-applications/search-application-client.md
rename to solutions/elasticsearch-solution-project/search-applications/search-application-client.md
diff --git a/solutions/search/search-applications/search-application-security.md b/solutions/elasticsearch-solution-project/search-applications/search-application-security.md
similarity index 100%
rename from solutions/search/search-applications/search-application-security.md
rename to solutions/elasticsearch-solution-project/search-applications/search-application-security.md
diff --git a/solutions/search/search-connection-details.md b/solutions/elasticsearch-solution-project/search-connection-details.md
similarity index 100%
rename from solutions/search/search-connection-details.md
rename to solutions/elasticsearch-solution-project/search-connection-details.md
diff --git a/solutions/index.md b/solutions/index.md
index fe72e53786..b42c587c84 100644
--- a/solutions/index.md
+++ b/solutions/index.md
@@ -17,23 +17,18 @@ description: Learn about Elastic solutions for search, observability, and securi
 New to Elastic? Refer to [Elastic Fundamentals](/get-started/index.md) to understand the {{stack}}, its components, and your deployment options.
 :::
 
-Users reach for Elastic products, features, and tools for three main use cases: observability, security, and search.
+Elastic helps you build applications for three main use cases: search, observability, and security. You can work directly with platform capabilities through APIs, use pre-built solutions with integrated UIs, or combine both approaches.
 
-These use cases are supported by ready-to-use implementations that help you get started quickly:
+## Choose your path
 
-- As integrated solutions on [{{ech}}](/deploy-manage/deploy/elastic-cloud/cloud-hosted.md) and [self-managed](/deploy-manage/deploy/self-managed.md) deployments
-- As project types on [{{serverless-full}}](/deploy-manage/deploy/elastic-cloud/serverless.md)
+| Your use case | What to use | Description |
+| --- | --- | --- |
+| Building search applications | 1. [Core search capabilities](/solutions/search.md)<br><br> 2. [Elasticsearch solution](/solutions/elasticsearch-solution-project.md) | - Core {{es}} search features available across all deployment types, solutions, and project types<br><br>- Additional UI tools that complement the core search features |
+| Monitoring applications or infrastructure | [Observability solution](/solutions/observability.md) | Monitor and troubleshoot with logs, metrics, and traces |
+| Protecting against threats | [Security solution](/solutions/security.md) | Detect and respond to security threats |
 
-While these solutions and project types provide pre-built components for common use cases, you can also build custom implementations using Elastic's features, APIs, and tools. This documentation guides you through:
+::::{tip}
+If you're not sure which solution to use, the {{es}} solution is a good starting point for general-purpose search use cases.
+::::
 
-1. Evaluating if an Elastic solution fits your needs.
-2. Getting started with your chosen solution.
-3. Implementing specific features and capabilities.
-
-Learn more in the following sections:
-
-| Solution | Use case | 
-| --- | --- | 
-| [Elasticsearch](search.md) | Build search experiences, or implement custom use cases with {{es}}
-| [Observability](observability.md) | Monitor and troubleshoot applications and infrastructure with {{product.observability}}
-| [Security](security.md) | Protect applications and infrastructure with {{elastic-sec}}
+**About solutions and project types:** Solutions are available as project types on {{serverless-full}} (select one when creating a project) or as solution views on {{ech}} and self-managed deployments (select a default solution view when creating a deployment, or configure per [space](/deploy-manage/manage-spaces.md)).
diff --git a/solutions/observability.md b/solutions/observability.md
index 01ca4f18f5..e229adba04 100644
--- a/solutions/observability.md
+++ b/solutions/observability.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: Observability
+navigation_title: Observability solution
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/what-is-observability-serverless.html
   - https://www.elastic.co/guide/en/observability/current/index.html
@@ -14,7 +14,7 @@ products:
   - id: edot-collector
 ---
 
-# Elastic Observability overview
+# Elastic Observability solution overview
 
 :::{include} ../get-started/_snippets/observability-overview.md
 :::
diff --git a/solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md b/solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
index 0185139693..ef38e630fb 100644
--- a/solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
+++ b/solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
@@ -35,7 +35,7 @@ Create the `otel-collector-config.yml` file with your EDOT Collector configurati
 
 ::::{step} Retrieve your settings
 
-Retrieve your [{{es}} endpoint](/solutions/search/search-connection-details.md) and [API key](/deploy-manage/api-keys/elasticsearch-api-keys.md).
+Retrieve your [{{es}} endpoint](/solutions/elasticsearch-solution-project/search-connection-details.md) and [API key](/deploy-manage/api-keys/elasticsearch-api-keys.md).
 ::::
 
 ::::{step} Create the .env file
diff --git a/solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md b/solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
index 28e5158fa1..e6f8f97b6d 100644
--- a/solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
+++ b/solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
@@ -35,7 +35,7 @@ Follow these steps to deploy the EDOT Collector and EDOT OTel SDKs.
 
 :::::{step} Configure the EDOT Collector
 
-Retrieve your [{{es}} endpoint](/solutions/search/search-connection-details.md) and [API key](/deploy-manage/api-keys/elasticsearch-api-keys.md) and replace `<ELASTICSEARCH_ENDPOINT>` and `<ELASTIC_API_KEY>` before applying the following command.
+Retrieve your [{{es}} endpoint](/solutions/elasticsearch-solution-project/search-connection-details.md) and [API key](/deploy-manage/api-keys/elasticsearch-api-keys.md) and replace `<ELASTICSEARCH_ENDPOINT>` and `<ELASTIC_API_KEY>` before applying the following command.
 
 ::::{tab-set}
 
diff --git a/solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md b/solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
index 76b4c04205..784135e518 100644
--- a/solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
+++ b/solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
@@ -41,7 +41,7 @@ helm repo add open-telemetry 'https://open-telemetry.github.io/opentelemetry-hel
 
 ::::{step} Set up credentials
 
-Retrieve your [{{es}} endpoint](/solutions/search/search-connection-details.md) and [API key](/deploy-manage/api-keys/elasticsearch-api-keys.md) and replace both in the following command to create a namespace and a secret with your credentials.
+Retrieve your [{{es}} endpoint](/solutions/elasticsearch-solution-project/search-connection-details.md) and [API key](/deploy-manage/api-keys/elasticsearch-api-keys.md) and replace both in the following command to create a namespace and a secret with your credentials.
 
 ```bash
 kubectl create namespace opentelemetry-operator-system
diff --git a/solutions/search.md b/solutions/search.md
index 500e5d7a21..10aa680826 100644
--- a/solutions/search.md
+++ b/solutions/search.md
@@ -1,40 +1,51 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-with-elasticsearch.html
-  - https://www.elastic.co/guide/en/serverless/current/what-is-elasticsearch-serverless.html
-  - https://www.elastic.co/guide/en/kibana/current/search-space.html
 applies_to:
   stack:
   serverless:
 products:
   - id: elasticsearch
   - id: cloud-serverless
-  - id: kibana
-navigation_title: Elasticsearch
+navigation_title: Search use case
 ---
 
-# Elasticsearch solution overview
+# Search use case
 
-The {{es}} solution and serverless project type enable you to build your own applications on top of the {{es}} platform's scalable data store, search engine, and vector database capabilities.
+This section documents core {{es}} search capabilities. These capabilities are available across all Elastic deployments, solutions, and project types.
 
-{{es}} is a distributed datastore that can ingest, index, and manage various types of data in near real-time, making them both searchable and analyzable.
-With specialized user interfaces and tools, it provides the flexibility to create, deploy, and run a wide range of applications, from search to analytics to AI-driven solutions.
+Use this section to understand search techniques, query methods, ranking strategies, and data ingestion for search applications.
 
-## Use cases
+::::{tip}
+Using the {{es}} solution or serverless project type? The [{{es}} solution documentation](/solutions/elasticsearch-solution-project.md) covers additional UI tools available if you are using the solution or project type.
+::::
+
+## What you can build
+
+Use {{es}} search capabilities to build search applications including:
+
+- Website and documentation search
+- Ecommerce product catalogs
+- Content recommendation systems
+- RAG (Retrieval Augmented Generation) systems
+- Geospatial search applications
+- Question answering systems
+- Custom observability or cybersecurity search tools
+- Much more!
 
-Here are a few common real-world applications:
+## Search use case documentation
 
-| Use case                             | Business goals                                                     | Technical requirements                                        |
-| ------------------------------------ | ------------------------------------------------------------------ | ------------------------------------------------------------- |
-| **Vector search/hybrid search** | Run nearest neighbour search, combine with text for hybrid results | Dense embeddings, sparse embeddings, combined with text/BM25       |
-| **Ecommerce/product catalog search** | Provide fast, relevant, and up-to-date results, faceted navigation | Inventory sync, user behavior tracking, results caching       |
-| **Workplace/knowledge base search**  | Search across range of data sources, enforcing permissions         | Third-party connectors, document-level security, role mapping |
-| **Website search**                   | Deliver relevant, up-to-date results                               | Web crawling, incremental indexing, query caching             |
-| **Customer support search**          | Surface relevant solutions, manage access controls, track metrics  | Knowledge graph, role-based access, analytics                 |
-| **Chatbots/RAG**                     | Enable natural conversations, provide context, maintain knowledge  | Vector search, ML models, knowledge base integration          |
-| **Geospatial search**                | Process location queries, sort by proximity, filter by area        | Geo-mapping, spatial indexing, distance calculations          |
+The following subjects are covered in this section:
 
-If you're new to {{es}} and want to try out some simple search use cases, go to [](/solutions/search/get-started.md) and [](/solutions/search/get-started/quickstarts.md).
+| Topic | Description |
+|-------|-------------|
+| [**Get started**](/solutions/search/get-started.md) | Create deployments, connect to {{es}}, and run your first searches |
+| [**Ingest data**](/solutions/search/ingest-for-search.md) |  Learn about options for getting data into {{es}} for search use cases | 
+| [**Search approaches**](/solutions/search/search-approaches.md) | Compare search techniques available in {{es}}, including full-text, vector, semantic, and hybrid search |
+| [**Build your queries**](/solutions/search/querying-for-search.md) | Implement your search approaches using specific query languages |
+| [**Ranking and reranking**](/solutions/search/ranking.md) | Control result ordering and relevance |
+| [**RAG**](/solutions/search/rag.md) | Learn about tools for retrieval augmented generation with {{es}}|
+| [**Building applications**](/solutions/search/site-or-app.md) | Integrate {{es}} into your websites or applications |
 
 ## Core concepts [search-concepts]
 
@@ -45,14 +56,4 @@ To dive more deeply into the building blocks of {{es}} clusters, including nodes
 ## Related reference
 
 * [{{es}} reference documentation](elasticsearch://reference/elasticsearch/index.md)
-* [Content connectors](elasticsearch://reference/search-connectors/index.md)
 * [{{es}} API documentation]({{es-apis}})
-
-::::{tip}
-Not sure whether {{es}} on {{serverless-full}} is the right deployment choice for you?
-
-Check out the following resources to help you decide:
-
-- [What’s different?](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md): Understand the differences between {{serverless-full}} and other deployment types.
-- [Billing](/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md): Learn about the billing model for {{es}} on {{serverless-full}}.
-::::
diff --git a/solutions/search/apis-and-tools.md b/solutions/search/apis-and-tools.md
index aa7ee1d26e..74c816c9b7 100644
--- a/solutions/search/apis-and-tools.md
+++ b/solutions/search/apis-and-tools.md
@@ -74,14 +74,18 @@ The accompanying [GitHub repository](https://www.github.com/elastic/elasticsearc
 
 ## Generative AI tools
 
+The following generative AI tools are available as part of the {{es}} solution and serverless project type. They enable you to build AI-powered search applications on top of the core {{es}} features, including retrieval augmented generation (RAG) systems and agentic workflows.
+
 ### 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](/solutions/elasticsearch-solution-project/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
 
-[Playground](rag/playground.md) enables you to use large language models (LLMs) to understand, explore, and analyze your {{es}} data using retrieval augmented generation (RAG), via a chat interface. Playground is also very useful for testing and debugging your {{es}} queries, using the [retrievers](retrievers-overview.md) syntax with the `_search` endpoint.
+[Playground](/solutions/elasticsearch-solution-project/playground.md) enables you to use large language models (LLMs) to understand, explore, and analyze your {{es}} data using retrieval augmented generation (RAG), via a chat interface. Playground is also useful for testing and debugging your {{es}} queries using the [retrievers](retrievers-overview.md) syntax with the `_search` endpoint.
 
 ### Model Context Protocol (MCP)
 
-The [Model Context Protocol (MCP)](mcp.md) lets you connect AI agents and assistants to your {{es}} data to enable natural language interactions with your indices.
\ No newline at end of file
+The [Model Context Protocol (MCP)](/solutions/elasticsearch-solution-project/mcp.md) lets you connect AI agents and assistants to your {{es}} data to enable natural language interactions with your indices.
+
+Refer to the [{{es}} solution documentation](/solutions/elasticsearch-solution-project.md) for more information about these UI tools.
\ No newline at end of file
diff --git a/solutions/search/get-started.md b/solutions/search/get-started.md
index 42148a7a0c..a73b6e215f 100644
--- a/solutions/search/get-started.md
+++ b/solutions/search/get-started.md
@@ -1,88 +1,55 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/getting-started.html
-  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-get-started.html
 applies_to:
   stack:
   serverless:
-    elasticsearch: all
 products:
   - id: elasticsearch
   - id: cloud-serverless
-navigation_title: Get started
-description: To try out an {{es}} project or solution, pick your deployment type, search goals, and ingestion method.
 ---
 
-# Get started with {{es}}
+# Get started with search
 
-New to {{es}}? Start building a search experience by setting up your first deployment, refining your search goals, and adding data.
+This guide helps you get started with search use cases using {{es}}, regardless of your deployment type, solution, or project type. Whether you're using a self-managed cluster, {{ech}}, or any type of serverless project, these core search capabilities are available to you.
 
-:::{note}
-If you're looking for an introduction to the {{stack}} or the {{es}} product, go to [](/get-started/index.md) or [](/manage-data/data-store.md).
-:::
-
-::::::{stepper}
-:::::{step} Choose your deployment type
-
-Elastic provides several self-managed and Elastic-managed options.
-For simplicity and speed, try out {{es-serverless}}:
-
-::::{dropdown} Create an {{es-serverless}} project
-:::{include} /deploy-manage/deploy/_snippets/create-serverless-project-intro.md
-:::
-
-Choose the {{es}} project type and provide a name.
-You can optionally edit the project settings, such as the [region](/deploy-manage/deploy/elastic-cloud/regions.md).
-
-When your project is created, you're ready to move on to the next step and to start creating indices, adding data, and performing searches.
+::::{tip}
+Using the {{es}} solution or serverless project type? Check out the [{{es}} solution documentation](/solutions/elasticsearch-solution-project.md) for UI tools like Agent Builder, Playground, and Search Applications that complement these core search capabilities.
 ::::
 
-Alternatively, create a [local development installation](/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md) in Docker:
-
-```sh
-curl -fsSL https://elastic.co/start-local | sh
-```
+## Before you begin
 
-Check out the full list of [deployment types](/deploy-manage/deploy.md#choosing-your-deployment-type) to learn more.
-:::::
+To follow along with this guide, you'll need:
 
-:::::{step} Identify your search goals
-Depending on your use case, you can choose multiple [search approaches](search-approaches.md), for example full-text and semantic search.
-Each approach affects your options for storing and querying your data.
+- An {{es}} cluster, or any type of serverless project. [Create a deployment or project](/get-started/deployment-options.md) if you don't have one yet.
+- Connection details for your cluster. Refer to [Connection details](/solutions/elasticsearch-solution-project/search-connection-details.md) for more information.
 
-If you're unsure which approaches match your goals, you can try them out with sample data. For example, [](/solutions/search/get-started/semantic-search.md).
+## Quickstarts
 
-If you prefer to ingest your data first and transform or reindex it as needed later, skip to the next step.
-:::::
-:::::{{step}} Ingest your data
+Choose a quickstart based on your use case:
 
-If your goals include vector or semantic AI-powered search, create vectorized data with built-in and third-party natural language processing (NLP) models and store it in an {{es}} vector database.
-The approach that requires the least configuration involves adding `semantic_text` fields when ingesting your data.
-This method is described in [](/solutions/search/semantic-search/semantic-search-semantic-text.md).
+- [**Index basics**](/solutions/search/get-started/index-basics.md): Learn how to create indices, add documents, and perform basic searches using the {{es}} APIs.
+- [**Keyword search with Python**](/solutions/search/get-started/keyword-search-python.md): Build a keyword search application using the Python client.
+- [**Semantic search**](/solutions/search/get-started/semantic-search.md): Implement semantic search using vector embeddings.
 
-To learn about adding data for other search goals, go to [](/solutions/search/ingest-for-search.md).
-For a broader overview of ingestion options, go to [](/manage-data/ingest.md).
+## Explore search approaches
 
-If you're not ready to add your own data, you can use [sample data](/manage-data/ingest/sample-data.md) or create small data sets when you follow the instructions in the [quickstarts](/solutions/search/get-started/quickstarts.md).
+Once you're comfortable with the basics, explore different search techniques:
 
-The {{es}} home page in the UI also provides workflow guides for creating indices and ready-to-use code examples for ingesting data by using REST APIs.
-:::::
-:::::{{step}} Build your search queries
+- [**Full-text search**](/solutions/search/full-text.md): Traditional text-based search with analysis and scoring.
+- [**Vector search**](/solutions/search/vector.md): Similarity search using dense or sparse vectors.
+- [**Semantic search**](/solutions/search/semantic-search.md): Context-aware search using machine learning models.
+- [**Hybrid search**](/solutions/search/hybrid-search.md): Combine multiple search techniques for better results.
 
-Your next steps will be to choose a method to write queries and interact with {{es}}.
-You can pick a programming language [client](/reference/elasticsearch-clients/index.md) that matches your application and choose which [query languages](/solutions/search/querying-for-search.md) you will use to express your search logic.
-Each decision builds on the previous ones, offering flexibility to mix and match approaches based on your needs.
+## Next steps
 
-Not sure where to start exploring?
-Get an introduction to [index and search basics](/solutions/search/get-started/index-basics.md) or [build your first search query with Python](/solutions/search/get-started/keyword-search-python.md).
-:::::
-::::::
+- Learn about [ingestion and data preparation](/solutions/search/ingest-for-search.md)
+- Explore [querying options](/solutions/search/querying-for-search.md) including Query DSL, {{esql}}, and retrievers
+- Understand [ranking and relevance](/solutions/search/ranking.md) to improve search quality
+- Build [RAG (Retrieval Augmented Generation)](/solutions/search/rag.md) applications
 
 ## Related resources
 
-Use these resources to learn more about {{es}} or get started in a different way:
-
-- [](/deploy-manage/deploy/deployment-comparison.md)
-- [Get started with Query DSL search and filters](elasticsearch://reference/query-languages/query-dsl/full-text-filter-tutorial.md)
-- [Get started with ES|QL queries](elasticsearch://reference/query-languages/esql/esql-getting-started.md)
-- [Analyze eCommerce data with aggregations using Query DSL](/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md)
+- [{{es}} API documentation]({{es-apis}})
+- [{{es}} reference documentation](elasticsearch://reference/elasticsearch/index.md)
+- [Query languages](/explore-analyze/query-filter/languages.md)
diff --git a/solutions/search/get-started/quickstarts.md b/solutions/search/get-started/quickstarts.md
index 3315a38e17..9ae2a9a9c2 100644
--- a/solutions/search/get-started/quickstarts.md
+++ b/solutions/search/get-started/quickstarts.md
@@ -8,7 +8,7 @@ products:
   - id: elasticsearch
 ---
 
-# {{es}} quickstarts
+# Quickstarts
 
 Quickstarts reduce your time-to-value by offering a fast path to learn about search strategies.
 Each quickstart provides:
diff --git a/solutions/search/ingest-for-search.md b/solutions/search/ingest-for-search.md
index 46e7a1eda7..0ccec585af 100644
--- a/solutions/search/ingest-for-search.md
+++ b/solutions/search/ingest-for-search.md
@@ -39,7 +39,7 @@ If you just want to do a quick test, you can load [sample data](/manage-data/ing
 You can use the [`_bulk` API]({{es-apis}}group/endpoint-document) to add data to your {{es}} indices, using any HTTP client, including the [{{es}} client libraries](/solutions/search/site-or-app/clients.md).
 
 ::::{tip}
-To connect to an {{es-serverless}} project, you must [find the connection details](/solutions/search/search-connection-details.md).
+To connect to an {{es-serverless}} project, you must [find the connection details](/solutions/elasticsearch-solution-project/search-connection-details.md).
 ::::
 
 While the {{es}} APIs can be used for any data type, Elastic provides specialized tools that optimize ingestion for specific use cases.
diff --git a/solutions/search/rag.md b/solutions/search/rag.md
index c8f2c3e9bf..e5be1ce88a 100644
--- a/solutions/search/rag.md
+++ b/solutions/search/rag.md
@@ -12,10 +12,8 @@ products:
 
 ::::{admonition} 🍿 Prefer a video introduction?
 Check out [this short video](https://www.youtube.com/watch?v=OS4ZefUPAks) from the Elastic Snackable Series.
-
 ::::
 
-
 Retrieval Augmented Generation (RAG) is a technique for improving language model responses by grounding the model with additional, verifiable sources of information. It works by first retrieving relevant context from an external datastore, which is then added to the model’s context window.
 
 RAG is a form of [in-context learning](https://arxiv.org/abs/2301.00234), where the model learns from information provided at inference time. Compared to fine-tuning or continuous pre-training, RAG can be implemented more quickly and cheaply, and offers several advantages.
@@ -57,18 +55,29 @@ The workflow is as follows:
 
 ::::{tip}
 A more advanced setup might include query rewriting between steps 1 and 2. This intermediate step could use one or more additional language models with different instructions to reformulate queries for more specific and detailed responses.
-
 ::::
 
+## Building RAG applications [rag-elasticsearch-getting-started]
+
+You can build RAG applications with {{es}} by retrieving relevant context from your indices and passing it to a language model. The basic approach works across all deployment types, solutions, and project types:
+
+1. Use {{es}} search capabilities (full-text, vector, semantic, or hybrid search) to retrieve relevant documents
+2. Pass the retrieved content as context to your language model
+3. The language model generates a response grounded in your data
+
+### Core search options
+
+**{{esql}} `COMPLETION` command:** Use the [`COMPLETION`](elasticsearch://reference/query-languages/esql/commands/completion.md) command to send prompts and context directly to language models within your {{esql}} queries.
 
+**Agent Builder:** Create AI agents that can search your {{es}} indices, use tools, and maintain conversational context. Agent Builder provides a complete framework for building stateful RAG applications. Learn more in the [Agent Builder documentation](/solutions/elasticsearch-solution-project/elastic-agent-builder.md).
 
-## Getting started [rag-elasticsearch-getting-started]
+**Custom implementation:** Retrieve documents using any {{es}} [search approach](/solutions/search/search-approaches.md) (Query DSL, {{esql}}, or retrievers), then integrate with your choice of language model provider in your applications code using their APIs or SDKs.
 
-Start building RAG applications quickly with Playground, which seamlessly integrates {{es}} with language model providers. The Playground UI enables you to build, test, and deploy RAG interfaces on top of your {{es}} indices.
+### {{es}} solution UI tools
 
-Playground automatically selects the best retrieval methods for your data, while providing full control over the final {{es}} queries and language model instructions. You can also download the underlying Python code to integrate with your existing applications.
+If you're using the {{es}} solution or serverless project type, these additional tools provide enable RAG workflows:
 
-Learn more in the [Playground documentation](rag/playground.md) and try the [interactive lab](https://www.elastic.co/demo-gallery/ai-playground) for hands-on experience.
+**Playground:** Build, test, and deploy RAG interfaces with a UI that automatically selects retrieval methods and provides full control over queries and model instructions. Download Python code to integrate with your applications. Learn more in the [Playground documentation](/solutions/elasticsearch-solution-project/playground.md).
 
 
 ## Learn more [rag-elasticsearch-learn-more]
diff --git a/solutions/search/retrievers-overview.md b/solutions/search/retrievers-overview.md
index 061b17c38f..c82a0c6dc0 100644
--- a/solutions/search/retrievers-overview.md
+++ b/solutions/search/retrievers-overview.md
@@ -139,7 +139,7 @@ The Search Playground builds Elasticsearch queries using the retriever abstracti
 
 You can use the Playground to experiment with different retriever configurations and see how they affect search results.
 
-Refer to the [Playground documentation](rag/playground.md) for more information.
+Refer to the [Playground documentation](/solutions/elasticsearch-solution-project/playground.md) for more information.
 
 
 ## Reference docs and examples [retrievers-overview-api-reference]
diff --git a/solutions/search/site-or-app.md b/solutions/search/site-or-app.md
index 24e99ceaf9..cacdb2441b 100644
--- a/solutions/search/site-or-app.md
+++ b/solutions/search/site-or-app.md
@@ -11,4 +11,4 @@ The following tools are available to help you add search to your site or app:
 
 - [Clients](site-or-app/clients.md): Use programming language clients to integrate {{es}} with your application.
 - [Search UI](site-or-app/search-ui.md): Use the Search UI library to build a user interface for your search application.
-- [Search Applications](search-applications.md): Use Search Applications to simplify the process of building search experiences, by leveraging [search templates](search-templates.md).
\ No newline at end of file
+- [Search Applications](/solutions/elasticsearch-solution-project/search-applications.md): Use Search Applications to simplify the process of building search experiences, by leveraging [search templates](/solutions/search/search-templates.md).
\ No newline at end of file
diff --git a/solutions/search/site-or-app/clients.md b/solutions/search/site-or-app/clients.md
index 89631e077d..3f79309806 100644
--- a/solutions/search/site-or-app/clients.md
+++ b/solutions/search/site-or-app/clients.md
@@ -32,5 +32,5 @@ In addition to official clients, the Elastic community has contributed libraries
 - [Community-contributed clients](elasticsearch://reference/community-contributed/index.md)
 
 ::::{tip}
-Learn how to [connect to your {{es}} endpoint](/solutions/search/search-connection-details.md).
+Learn how to [connect to your {{es}} endpoint](/solutions/elasticsearch-solution-project/search-connection-details.md).
 ::::
\ No newline at end of file
diff --git a/solutions/security.md b/solutions/security.md
index d4a1dd6f0a..24c8152740 100644
--- a/solutions/security.md
+++ b/solutions/security.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: Security
+navigation_title: Security solution
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/index.html
   - https://www.elastic.co/guide/en/security/current/es-overview.html
@@ -16,7 +16,7 @@ products:
 description: Elastic Security combines threat detection analytics, cloud native security, and endpoint protection capabilities in a single solution.
 ---
 
-# {{elastic-sec}} overview [es-overview]
+# {{elastic-sec}} solution & project type overview [es-overview]
 
 :::{include} ../get-started/_snippets/security-overview.md
 :::
diff --git a/solutions/toc.yml b/solutions/toc.yml
index 82f9883d84..49875f7620 100644
--- a/solutions/toc.yml
+++ b/solutions/toc.yml
@@ -5,7 +5,6 @@ toc:
     children:
       - file: search/get-started.md
         children:
-          - file: search/search-connection-details.md
           - file: search/get-started/quickstarts.md
             children:
               - file: search/get-started/index-basics.md
@@ -19,15 +18,15 @@ toc:
           - file: search/full-text.md
             children:
               - file: search/full-text/how-full-text-works.md
-              - file: search/full-text/search-with-synonyms.md
-                children:
-                  - file: search/full-text/create-update-synonyms-api-example.md
               - file: search/full-text/text-analysis-during-search.md
               - file: search/full-text/search-relevance.md
                 children:
                   - file: search/full-text/search-relevance/mixing-exact-search-with-stemming.md
                   - file: search/full-text/search-relevance/consistent-scoring.md
                   - file: search/full-text/search-relevance/static-scoring-signals.md
+              - file: search/full-text/search-with-synonyms.md
+                children:
+                  - file: search/full-text/create-update-synonyms-api-example.md
           - file: search/ai-search/ai-search.md
             children:
               - file: search/vector.md
@@ -62,44 +61,47 @@ 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/permissions.md
-          - file: search/agent-builder/limitations-known-issues.md
       - file: search/rag.md
-        children:
-          - file: search/rag/playground.md
-            children:
-              - file: search/rag/playground-context.md
-              - file: search/rag/playground-query.md
-              - file: search/rag/playground-troubleshooting.md
-          - file: search/mcp.md
       - file: search/site-or-app.md
         children:
           - file: search/site-or-app/clients.md
           - file: search/site-or-app/search-ui.md
-          - file: search/search-applications.md
-            children:
-              - file: search/search-applications/search-application-api.md
-              - file: search/search-applications/search-application-security.md
-              - file: search/search-applications/search-application-client.md
-
       - file: search/apis-and-tools.md
-      - file: search/ai-assistant.md
-      - file: search/query-rules-ui.md
+  - file: elasticsearch-solution-project.md
+    children:
+      - file: elasticsearch-solution-project/get-started.md
+        children:
+          - file: elasticsearch-solution-project/search-connection-details.md
+      - file: elasticsearch-solution-project/elastic-agent-builder.md
+        children:
+          - file: elasticsearch-solution-project/agent-builder/get-started.md
+          - file: elasticsearch-solution-project/agent-builder/models.md
+          - file: elasticsearch-solution-project/agent-builder/chat.md
+          - file: elasticsearch-solution-project/agent-builder/agent-builder-agents.md
+          - file: elasticsearch-solution-project/agent-builder/tools.md
+            children:
+              - file: elasticsearch-solution-project/agent-builder/tools/esql-tools.md
+              - file: elasticsearch-solution-project/agent-builder/tools/index-search-tools.md
+          - file: elasticsearch-solution-project/agent-builder/programmatic-access.md
+            children:
+              - file: elasticsearch-solution-project/agent-builder/kibana-api.md
+              - file: elasticsearch-solution-project/agent-builder/a2a-server.md
+              - file: elasticsearch-solution-project/agent-builder/mcp-server.md
+          - file: elasticsearch-solution-project/agent-builder/permissions.md
+          - file: elasticsearch-solution-project/agent-builder/limitations-known-issues.md
+      - file: elasticsearch-solution-project/playground.md
+        children:
+          - file: elasticsearch-solution-project/playground-context.md
+          - file: elasticsearch-solution-project/playground-query.md
+          - file: elasticsearch-solution-project/playground-troubleshooting.md
+      - file: elasticsearch-solution-project/mcp.md
+      - file: elasticsearch-solution-project/search-applications.md
+        children:
+          - file: elasticsearch-solution-project/search-applications/search-application-api.md
+          - file: elasticsearch-solution-project/search-applications/search-application-security.md
+          - file: elasticsearch-solution-project/search-applications/search-application-client.md
+      - file: elasticsearch-solution-project/ai-assistant.md
+      - file: elasticsearch-solution-project/query-rules-ui.md
   - file: observability.md
     children:
       - file: observability/get-started.md