diff --git a/content/manuals/ai/gordon/images/gordon.png b/content/manuals/ai/gordon/images/gordon.png
new file mode 100644
index 00000000000..f2b65c94ca0
Binary files /dev/null and b/content/manuals/ai/gordon/images/gordon.png differ
diff --git a/content/manuals/ai/gordon/images/gordon.webp b/content/manuals/ai/gordon/images/gordon.webp
deleted file mode 100644
index ebf97291489..00000000000
Binary files a/content/manuals/ai/gordon/images/gordon.webp and /dev/null differ
diff --git a/content/manuals/ai/gordon/images/toolbox.png b/content/manuals/ai/gordon/images/toolbox.png
new file mode 100644
index 00000000000..1ee8251f7d2
Binary files /dev/null and b/content/manuals/ai/gordon/images/toolbox.png differ
diff --git a/content/manuals/ai/gordon/images/toolbox.webp b/content/manuals/ai/gordon/images/toolbox.webp
deleted file mode 100644
index ae8fcf00680..00000000000
Binary files a/content/manuals/ai/gordon/images/toolbox.webp and /dev/null differ
diff --git a/content/manuals/ai/gordon/mcp/built-in-tools.md b/content/manuals/ai/gordon/mcp/built-in-tools.md
index 9fd76880ac1..9d253f0c445 100644
--- a/content/manuals/ai/gordon/mcp/built-in-tools.md
+++ b/content/manuals/ai/gordon/mcp/built-in-tools.md
@@ -21,13 +21,13 @@ To configure:
 
 1. On the **Ask Gordon** view in Docker Desktop, select the `Toolbox` button in the bottom left of the input area.
 
-   ![Gordon page with the toolbox button](../images/gordon.webp)
+   ![Gordon page with the toolbox button](../images/gordon.png)
 
-2. Choose the tools you want to make available. Selecting a card lets you view extra information regarding each tool and what it does.
+2. To enable or disable a tool, select it in the left-menu and select the toggle.
 
-   ![Gordon's Toolbox](../images/toolbox.webp)
+   ![Gordon's Toolbox](../images/toolbox.png)
 
-   For more information on the possible tools, see [Reference](#reference).
+   For more information on the available Docker tools, see [Reference](#reference).
 
 ## Usage examples
 
@@ -108,7 +108,7 @@ $ docker ai "Show me logs from the auth-service pod"
 
 
 ```console
-# Scan  for CVEs
+# Scan for CVEs
 $ docker ai "Scan my application for security vulnerabilities"
 
 # Get security recommendations
@@ -136,13 +136,11 @@ Tools to interact with your Docker containers, images, and volumes.
 
 #### Container management
 
-| Name | Description |
-|------|-------------|
-| `list_containers` | List all Docker containers |
-| `remove_containers` | Remove one or more Docker containers |
-| `stop_container` | Stop a running Docker container |
-| `fetch_container_logs` | Retrieve logs from a Docker container |
-| `run_container` | Run a new Docker container |
+| Name          | Description                            |
+|---------------|----------------------------------------|
+| `docker`      | Access to the Docker CLI               |
+| `list_builds` | List the builds in the Docker daemon   |
+| `build_logs`  | Show the build logs.                   |
 
 #### Volume management
 
@@ -224,15 +222,12 @@ General-purpose development utilities.
 
 | Tool | Description |
 |------|-------------|
-| `list_models` | List all available AI models |
-| `pull_model` | Download an AI model |
+| `list_models` | List all available Docker models |
+| `pull_model` | Download an Docker model |
 | `run_model` | Query a model with a prompt |
-| `remove_model` | Remove an AI model |
+| `remove_model` | Remove an Docker model |
 
-### AI Tool Catalog
+### Docker MCP Catalog
 
-When the [AI Tool
-Catalog](https://open.docker.com/extensions/marketplace?extensionId=docker/labs-ai-tools-for-devs)
-Docker Desktop extension is installed, all the tools enabled in the catalog are
-available for Gordon to use. After installation, you can enable the usage of the
-AI Tool Catalog tools in the toolbox section of Gordon.
+If you have enabled the [MCP Toolkit feature](../../mcp-catalog-and-toolkit/_index.md), 
+all the tools you have enabled and configured are available for Gordon to use.
diff --git a/content/manuals/ai/gordon/mcp/yaml.md b/content/manuals/ai/gordon/mcp/yaml.md
index 326c5d6071a..806e2aaa7f6 100644
--- a/content/manuals/ai/gordon/mcp/yaml.md
+++ b/content/manuals/ai/gordon/mcp/yaml.md
@@ -132,42 +132,3 @@ you can get started:
 With MCP support, Gordon offers powerful extensibility and flexibility to meet
 your specific use cases whether you’re adding temporal awareness, file
 management, or internet access.
-
-### Compatible MCP servers
-
-These are MCP servers that have been tested with Gordon and are known to be
-working:
-
-- `mcp/time`
-- `mcp/fetch`
-- `mcp/filesystem`
-- `mcp/postgres`
-- `mcp/git`
-- `mcp/sqlite`
-- `mcp/github`
-
-### Untested (should work with appropriate API tokens)
-
-These are MCP servers that were not tested but should work if given the
-appropriate API tokens:
-
-- `mcp/brave-search`
-- `mcp/gdrive`
-- `mcp/slack`
-- `mcp/google-maps`
-- `mcp/gitlab`
-- `mcp/everything`
-- `mcp/aws-kb-retrieval-server`
-- `mcp/sentry`
-
-### Unsupported
-
-These are MCP servers that are currently known to be unsupported:
-
-- `mcp/sequentialthinking` - (The tool description is too long)
-- `mcp/puppeteer` - Puppeteer sends back images and Gordon doesn’t know how to
-  handle them, it only handles text responses from tools
-- `mcp/everart` - Everart sends back images and Gordon doesn’t know how to
-  handle them, it only handles text responses from tools
-- `mcp/memory` - There is no way to configure the server to use a custom path
-  for its knowledge base