diff --git a/content/en/bits_ai/mcp_server/setup.md b/content/en/bits_ai/mcp_server/setup.md
index e6271dfc98b..447673a3a85 100644
--- a/content/en/bits_ai/mcp_server/setup.md
+++ b/content/en/bits_ai/mcp_server/setup.md
@@ -356,6 +356,38 @@ Selected endpoint ({{< region-param key="dd_site_name" >}}): <code>{{< region-pa
 [3]: /getting_started/site/
 {{% /tab %}}
 
+{{% tab "Goose" %}}
+
+Point your AI agent to the MCP Server endpoint for your regional [Datadog site][3]. For the correct instructions, use the **Datadog Site** selector on the right side of this documentation page to select your site.
+
+{{< site-region region="us,us3,us5,eu,ap1,ap2" >}}
+Selected endpoint ({{< region-param key="dd_site_name" >}}): <code>{{< region-param key="mcp_server_endpoint" >}}</code>.
+
+1. One-click install (recommended): Use this deeplink to add the Datadog MCP Server to Goose:
+
+   <pre><code>goose://extension?url={{< region-param key="mcp_server_endpoint" >}}&type=streamable_http&id=datadog&name=Datadog&description=Datadog%20MCP%20Server</code></pre>
+
+   To tune extension response wait time, include the optional `timeout` query parameter (seconds).
+
+1. Alternatively, follow Goose's [Add an MCP server][2] instructions. Use the selected endpoint shown above as the remote Streamable HTTP server URL. You can also modify Goose's config directly for future updates at `~/.config/goose/config.yaml`.
+
+1. To enable [product-specific tools][1], include the `toolsets` query parameter at the end of the endpoint URL. For example, this URL enables _only_ APM and LLM Observability tools (use `toolsets=all` to enable all generally available toolsets, best for clients that support tool filtering):
+
+    <pre><code>{{< region-param key="mcp_server_endpoint" >}}?toolsets=apm,llmobs</code></pre>
+
+1. The first time you open a session with this extension activated, you are prompted to choose your Datadog account.
+
+[1]: /bits_ai/mcp_server#toolsets
+[2]: https://goose-docs.ai/docs/getting-started/using-extensions/#mcp-servers
+{{< /site-region >}}
+
+{{< site-region region="gov" >}}
+<div class="alert alert-danger">Datadog MCP Server is not supported for your selected site ({{< region-param key="dd_site_name" >}}).</div>
+{{< /site-region >}}
+
+[3]: /getting_started/site/
+{{% /tab %}}
+
 {{% tab "Other" %}}
 
 For most other [supported clients](#supported-clients), use these instructions for remote authentication. For Cline or when remote authentication is unreliable or not available, use [local binary authentication](#local-binary-authentication).
@@ -407,12 +439,13 @@ Example configuration file location:
 | [Cursor][3] | Cursor | Datadog [Cursor & VS Code extension][15] recommended. |
 | [Claude Code][4] | Anthropic | |
 | [Claude][19] | Anthropic | Use [custom connector setup](?tab=claude#installation). Includes Claude Cowork. |
-| [Codex CLI][6] | OpenAI | |
+| [Codex][6], [Codex CLI][29] | OpenAI | |
 | [Warp][28] | Warp | |
 | [VS Code][7] | Microsoft | Datadog [Cursor & VS Code extension][16] recommended. |
 | [JetBrains IDEs][18] | JetBrains | [Datadog plugin][18] recommended. |
 | [Kiro][9], [Kiro CLI][10] | Amazon Web Services | |
-| [Goose][8], [Cline][11] | Various | See the **Other** tab above. Use local binary authentication for Cline if remote authentication is unreliable. |
+| [Goose][8] | Agentic AI Foundation | |
+| [Cline][11] | Various | See the **Other** tab above. Use local binary authentication for Cline if remote authentication is unreliable. |
 
 <div class="alert alert-info">The Datadog MCP Server is under significant development, and additional supported clients may become available.</div>
 
@@ -553,3 +586,4 @@ All toolsets for the MCP Server are documented [here][12]. By default, the base
 [26]: https://app.datadoghq.com/organization-settings/roles
 [27]: https://app.datadoghq.com/organization-settings/preferences
 [28]: https://www.warp.dev/
+[29]: https://developers.openai.com/codex/cli