diff --git a/solutions/search/agent-builder/get-started.md b/solutions/search/agent-builder/get-started.md
index fd32a0c49c..a364b0e091 100644
--- a/solutions/search/agent-builder/get-started.md
+++ b/solutions/search/agent-builder/get-started.md
@@ -21,7 +21,7 @@ Refer to the [overview page](../elastic-agent-builder.md) for the full list of A
 
 Learn how to get started by enabling the {{agent-builder}} features and begin chatting with your data.
 
-:::::{stepper}
+::::::{stepper}
 ::::{step} Set up an Elastic 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).
@@ -33,25 +33,39 @@ You can set up a new [space](/deploy-manage/manage-spaces.md) to use the solutio
 
 ::::
 
-::::{step} Enable {{agent-builder}}
+:::::{step} Enable {{agent-builder}}
 
-{{agent-builder}} is turned off by default in the initial release, so you need to enable the feature to get started.
+::::{applies-switch}
+
+:::{applies-item} stack: preview 9.2
+
+You have to enable {{agent-builder}} to get started on non-serverless deployments.
 
 You can enable the features using the UI:
 
-1. Navigate to **Agent Builder** under **AI** using the navigation menu or the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
+1. Search for **AI / Agent Builder** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
 2. Toggle **{{agent-builder}}** to on.
 3. Select **Save changes**.
 
-Refresh the browser page and find **Agents** in the navigation menu to begin using the feature.
-You can also search for **Agent Builder** in the [global search bar](/explore-analyze/find-and-organize/find-apps-and-objects.md).
+Find **Agents** in the navigation menu to begin using the feature, or search for **Agents** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
+
+:::
+
+:::{applies-item} serverless:
+
+{{agent-builder}} is enabled by default in serverless deployments.
 
+Find **Agents** in the navigation menu to begin using the feature, or search for **Agents** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
+
+:::
 
 ::::
 
+:::::
+
 ::::{step} Ingest some data
 
-Before you begin with agents, you need some data in your {{es}} cluster. Otherwise, you will be chatting to the underlying LLM without any retrieval-augmented context.
+Before you begin with agents, you need some data in {{es}}. Otherwise, you will be chatting to the underlying LLM without any retrieval-augmented context.
 
 To learn about adding data for search use cases, go to [](/solutions/search/ingest-for-search.md).
 For a broader overview of ingestion options, go to [](/manage-data/ingest.md).
@@ -80,4 +94,4 @@ Once you've tested the default **Elastic AI Agent** with the [built-in Elastic t
 
 ::::
 
-:::::
+::::::
diff --git a/solutions/search/agent-builder/limitations-known-issues.md b/solutions/search/agent-builder/limitations-known-issues.md
index cffa7aa60d..b33a30d337 100644
--- a/solutions/search/agent-builder/limitations-known-issues.md
+++ b/solutions/search/agent-builder/limitations-known-issues.md
@@ -18,11 +18,11 @@ These pages are currently hidden from the docs TOC and have `noindexed` meta hea
 
 ### Agent Builder not enabled by default
 
-While in private technical preview, {{agent-builder}} is not enabled by default. Refer to [Get started](get-started.md#enable-agent-builder) for instructions.
+{{agent-builder}} must be enabled for non-serverless deployments {applies_to}`stack: preview 9.2`. Refer to [Get started](get-started.md#enable-agent-builder) for instructions.
 
 ### Model selection
 
-Initially, {{agent-builder}} only supports working with the [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) running on the [Elastic Inference Service](/explore-analyze/elastic-inference/eis.md) {applies_to}`serverless: preview` {applies_to}`ess: preview 9.2`.
+Initially, {{agent-builder}} only supports working with the [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) running on the [Elastic Inference Service](/explore-analyze/elastic-inference/eis.md) {applies_to}`stack: preview 9.2`.
 
 Learn about [pricing](https://www.elastic.co/pricing/serverless-search) for the Elastic Managed LLM.
 
@@ -46,6 +46,8 @@ Error executing agent: No tool calls found in the response.
 
 {{esql}} tools are subject to the current limitations of the {{esql}} language itself. For example, [named parameters](elasticsearch://reference/query-languages/esql/esql-syntax.md#esql-function-named-params) (`?parameter_name`) do not currently work with the `LIKE` and `RLIKE` operators ([issue #131356](https://github.com/elastic/elasticsearch/issues/131356)).
 
+For non-serverless deployments, ensure your cluster supports the {{esql}} features you intend to use.
+
 For a complete list of {{esql}} limitations, refer to the the [{{esql}} limitations documentation](elasticsearch://reference/query-languages/esql/limitations.md).
 
 ### Misinterpreted SQL syntax as ES|QL