diff --git a/content/en/bits_ai/mcp_server/_index.md b/content/en/bits_ai/mcp_server/_index.md
index 9c894ab07ab..b484773da10 100644
--- a/content/en/bits_ai/mcp_server/_index.md
+++ b/content/en/bits_ai/mcp_server/_index.md
@@ -81,7 +81,7 @@ The Datadog MCP Server supports _toolsets_, which allow you to use only the tool
- `software-delivery`: Tools for interacting with Software Delivery ([CI Visibility][21] and [Test Optimization][24])
- `synthetics`: Tools for interacting with Datadog [Synthetic tests][20]
-To use a toolset, include the `toolsets` query parameter in the endpoint URL when connecting to the MCP Server ([remote authentication][27] only).
+To use a toolset, include the `toolsets` query parameter in the endpoint URL when connecting to the MCP Server (not available with [local binary authentication][39]).
{{< site-region region="us,us3,us5,eu,ap1,ap2" >}}
For example, based on your selected [Datadog site][36] ({{< region-param key="dd_site_name" >}}):
@@ -774,3 +774,4 @@ The Datadog MCP Server is under significant development. Use [this feedback form
[36]: /getting_started/site/#navigate-the-datadog-documentation-by-site
[37]: https://help.datadoghq.com/hc/en-us/requests/new
[38]: /service_management/case_management/
+[39]: /bits_ai/mcp_server/setup#local-binary-authentication
diff --git a/content/en/bits_ai/mcp_server/setup.md b/content/en/bits_ai/mcp_server/setup.md
index 90ff6e956c9..68246a4f321 100644
--- a/content/en/bits_ai/mcp_server/setup.md
+++ b/content/en/bits_ai/mcp_server/setup.md
@@ -45,12 +45,10 @@ To install the extension:
{{% tab "Claude Code" %}}
-You can connect Claude Code to the Datadog MCP Server using remote authentication (HTTP) or local binary authentication (stdio).
-
-### Remote authentication
+Point your AI agent to the MCP Server endpoint for your regional [Datadog site][1].
{{< site-region region="us,us3,us5,eu,ap1,ap2" >}}
-Point your AI agent to the MCP Server endpoint for your regional [Datadog site][1]. For example, the endpoint for your selected site ({{< region-param key="dd_site_name" >}}) is: {{< region-param key="mcp_server_endpoint" >}}.
+For example, the endpoint for your selected site ({{< region-param key="dd_site_name" >}}) is: {{< region-param key="mcp_server_endpoint" >}}.
* **Command line**: Run:
claude mcp add --transport http datadog-mcp {{< region-param key="mcp_server_endpoint" >}}
@@ -78,32 +76,7 @@ Point your AI agent to the MCP Server endpoint for your regional [Datadog site][
[1]: /getting_started/site/
{{< /site-region >}}
-### Local binary authentication
-
-Use this option if remote authentication is not available. After installation, you typically do not need to update the local binary to benefit from MCP Server updates, as the tools are remote.
-
-1. Install the Datadog MCP Server binary (macOS and Linux):
- ```bash
- curl -sSL https://coterm.datadoghq.com/mcp-cli/install.sh | bash
- ```
- This installs the binary to `~/.local/bin/datadog_mcp_cli`.
-
-2. Run `datadog_mcp_cli login` manually to walk through the OAuth login flow and choose a [Datadog site][1].
-
-3. Configure Claude Code. Add to `~/.claude.json` (replace `` with your username):
- ```json
- {
- "mcpServers": {
- "datadog": {
- "type": "stdio",
- "command": "/Users//.local/bin/datadog_mcp_cli",
- "args": [],
- "env": {}
- }
- }
- }
- ```
- Or run: `claude mcp add datadog --scope user -- ~/.local/bin/datadog_mcp_cli`
+
[1]: /getting_started/site/
{{% /tab %}}
@@ -245,9 +218,7 @@ The [Datadog plugin][3] integrates with these agent CLIs. For an uninterrupted e
{{% tab "Other" %}}
-The following clients can connect to the Datadog MCP Server: [Goose][1], [Kiro][2], [Kiro CLI][3], [Cline][4], and other MCP-compatible clients. Use **remote authentication** when your client supports it. For Cline or when remote authentication is unreliable, use **local binary authentication**.
-
-### Remote authentication
+The following clients can connect to the Datadog MCP Server: [Goose][1], [Kiro][2], [Kiro CLI][3], [Cline][4], and other MCP-compatible clients. Use these instructions for remote authentication when your client supports it. For Cline or when remote authentication is unreliable or not available, use [local binary authentication](#local-binary-authentication).
{{< site-region region="us,us3,us5,eu,ap1,ap2" >}}
Point your AI agent to the MCP Server endpoint for your regional [Datadog site][1]. For example, the endpoint for your selected site ({{< region-param key="dd_site_name" >}}) is: {{< region-param key="mcp_server_endpoint" >}}.
@@ -282,43 +253,11 @@ Point your AI agent to the MCP Server endpoint for your regional [Datadog site][
[1]: /getting_started/site/
{{< /site-region >}}
-### Local binary authentication
-
-Local authentication is recommended for Cline and when remote authentication is unreliable.
-
-1. Install the Datadog MCP Server binary:
-
- - macOS and Linux: Install the binary to `~/.local/bin/datadog_mcp_cli`:
-
- ```bash
- curl -sSL https://coterm.datadoghq.com/mcp-cli/install.sh | bash
- ```
-
- - Windows: Download the [Windows version][6].
-
-2. Run `datadog_mcp_cli login` manually to walk through the OAuth login flow and choose a [Datadog site][5].
-
-3. Configure your AI client to use the stdio transport with `datadog_mcp_cli` as the command. Example:
- ```json
- {
- "mcpServers": {
- "datadog": {
- "type": "stdio",
- "command": "/Users//.local/bin/datadog_mcp_cli",
- "args": [],
- "env": {}
- }
- }
- }
- ```
- On Windows, replace the `command` path with the location of the downloaded `.exe` file (for example, `C:\Users\\bin\datadog_mcp_cli.exe`).
-
[1]: https://github.com/block/goose
[2]: https://kiro.dev/
[3]: https://kiro.dev/cli/
[4]: https://cline.bot/
[5]: /getting_started/site/
-[6]: https://coterm.datadoghq.com/mcp-cli/datadog_mcp_cli.exe
{{% /tab %}}
{{< /tabs >}}
@@ -363,6 +302,43 @@ For example, based on your selected [Datadog site][17] ({{< region-param key="dd
For security, use a scoped API key and application key from a [service account][13] that has only the required permissions.
+### Local binary authentication
+
+Local authentication is recommended for Cline and when [remote authentication](#installation) is unreliable or not available. After installation, you typically do not need to update the local binary to benefit from MCP Server updates, as the tools are remote.
+
+{{% collapse-content title="Set up Datadog MCP Server local binary" level="h5" expanded=false id="mcp-local-binary" %}}
+
+1. Install the Datadog MCP Server binary (macOS and Linux):
+ ```bash
+ curl -sSL https://coterm.datadoghq.com/mcp-cli/install.sh | bash
+ ```
+ This installs the binary to `~/.local/bin/datadog_mcp_cli`.
+
+ For Windows, download the [Windows version][20].
+
+2. Run `datadog_mcp_cli login` manually to walk through the OAuth login flow and choose a [Datadog site][21].
+
+3. Configure your AI client to use the stdio transport with `datadog_mcp_cli` as the command. For example (replace `` with your username):
+ ```json
+ {
+ "mcpServers": {
+ "datadog": {
+ "type": "stdio",
+ "command": "/Users//.local/bin/datadog_mcp_cli",
+ "args": [],
+ "env": {}
+ }
+ }
+ }
+ ```
+
+ On Windows, replace the `command` path with the location of the downloaded `.exe` file (for example, `C:\Users\\bin\datadog_mcp_cli.exe`).
+
+ For Claude Code, you can instead run:
+
claude mcp add datadog --scope user -- ~/.local/bin/datadog_mcp_cli