diff --git a/AGENTS.md b/AGENTS.md
index 9826aade..f90a7a50 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -399,7 +399,7 @@ Parameters can be referenced in custom steps using `${{ parameters.paramName }}`
 
 #### Auto-injected `clearMemory` Parameter
 
-When `safe-outputs.memory` is configured, the compiler automatically injects a `clearMemory` boolean parameter (default: `false`) at the beginning of the parameters list. This parameter:
+When `tools.cache-memory` is configured, the compiler automatically injects a `clearMemory` boolean parameter (default: `false`) at the beginning of the parameters list. This parameter:
 
 - Is surfaced in the ADO UI when manually queuing a run
 - When set to `true`, skips downloading the previous agent memory artifact
@@ -566,7 +566,7 @@ Explicit markings are embedded in these templates that the compiler is allowed t
 
 Should be replaced with the top-level `parameters:` block generated from the `parameters` front matter field. If no parameters are defined (and no auto-injected parameters apply), this marker is replaced with an empty string.
 
-When `safe-outputs.memory` is configured, the compiler auto-injects a `clearMemory` boolean parameter (default: `false`) unless one is already user-defined.
+When `tools.cache-memory` is configured, the compiler auto-injects a `clearMemory` boolean parameter (default: `false`) unless one is already user-defined.
 
 Example output:
 ```yaml
@@ -1648,6 +1648,7 @@ mcp-servers:
 - `headers:` - HTTP headers to include in requests (e.g., `Authorization`, `X-MCP-Toolsets`)
 
 **Common (both types):**
+- `enabled:` - Whether this MCP server is active (default: `true`). Set to `false` to temporarily disable an entry without removing it from the front matter.
 - `allowed:` - Array of tool names the agent is permitted to call (required for security)
 - `env:` - Environment variables for the MCP server process. Use `""` (empty string) for passthrough from the pipeline environment.
 
diff --git a/README.md b/README.md
index ec879879..98aaed42 100644
--- a/README.md
+++ b/README.md
@@ -328,6 +328,7 @@ mcp-servers:
     container: "node:20-slim"
     entrypoint: "node"
     entrypoint-args: ["path/to/mcp-server.js"]
+    # enabled: set to false to temporarily disable without removing the entry
     # args: additional Docker runtime arguments inserted before the image name
     #   (e.g. ["--memory", "512m"]).  Dangerous flags like --privileged trigger
     #   a compile-time warning.
diff --git a/prompts/create-ado-agentic-workflow.md b/prompts/create-ado-agentic-workflow.md
index f461056d..b227e73e 100644
--- a/prompts/create-ado-agentic-workflow.md
+++ b/prompts/create-ado-agentic-workflow.md
@@ -201,6 +201,7 @@ mcp-servers:
     container: "node:20-slim"
     entrypoint: "node"
     entrypoint-args: ["path/to/server.js"]
+    enabled: false             # Set to false to temporarily disable without removing
     env:
       API_KEY: "$(MY_SECRET)"
     allowed: