diff --git a/.github/agentics/nightly-mcp-stress-test.md b/.github/agentics/nightly-mcp-stress-test.md
index 5ca1a780..eae430b8 100644
--- a/.github/agentics/nightly-mcp-stress-test.md
+++ b/.github/agentics/nightly-mcp-stress-test.md
@@ -18,7 +18,7 @@ Test the MCP Gateway's ability to handle multiple diverse MCP servers simultaneo
 
 ## Important: MCP Gateway is Pre-Configured
 
-**The MCP Gateway is already running and configured with 20 MCP servers via the `sandbox.mcp` configuration in the workflow.**
+**The MCP Gateway is already running and configured with 20 MCP servers via the `mcp-servers` configuration in the workflow.**
 
 You do NOT need to:
 - ❌ Build the gateway (`make build`)
@@ -219,7 +219,7 @@ Error: Missing or invalid SLACK_BOT_TOKEN environment variable
 ```markdown
 ## Test Execution
 
-- **MCP Gateway:** Provided by sandbox.mcp configuration
+- **MCP Gateway:** Provided by sandbox.mcp (gateway container) with mcp-servers configuration
 - **Test Duration:** Xm Ys
 - **Servers Tested Sequentially:** Yes
 - **Any Gateway Issues:** None / {describe if any}
diff --git a/.github/workflows/nightly-mcp-stress-test.md b/.github/workflows/nightly-mcp-stress-test.md
index 06c6df1d..a3ca314c 100644
--- a/.github/workflows/nightly-mcp-stress-test.md
+++ b/.github/workflows/nightly-mcp-stress-test.md
@@ -23,74 +23,75 @@ tools:
     toolsets: [default]
   bash: ["*"]
 
+mcp-servers:
+  github:
+    type: stdio
+    container: "ghcr.io/github/github-mcp-server:v0.30.2"
+    env:
+      GITHUB_PERSONAL_ACCESS_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+  filesystem:
+    type: stdio
+    container: "mcp/filesystem"
+    mounts:
+      - "/tmp/mcp-test-fs:/workspace:rw"
+  memory:
+    type: stdio
+    container: "mcp/memory"
+  sqlite:
+    type: stdio
+    container: "mcp/sqlite"
+  postgres:
+    type: stdio
+    container: "mcp/postgres"
+  brave-search:
+    type: stdio
+    container: "mcp/brave-search"
+  fetch:
+    type: stdio
+    container: "mcp/fetch"
+  puppeteer:
+    type: stdio
+    container: "mcp/puppeteer"
+  slack:
+    type: stdio
+    container: "mcp/slack"
+  gdrive:
+    type: stdio
+    container: "mcp/gdrive"
+  google-maps:
+    type: stdio
+    container: "mcp/google-maps"
+  everart:
+    type: stdio
+    container: "mcp/everart"
+  sequential-thinking:
+    type: stdio
+    container: "mcp/sequential-thinking"
+  aws-kb-retrieval:
+    type: stdio
+    container: "mcp/aws-kb-retrieval"
+  linear:
+    type: stdio
+    container: "mcp/linear"
+  sentry:
+    type: stdio
+    container: "mcp/sentry"
+  raygun:
+    type: stdio
+    container: "mcp/raygun"
+  git:
+    type: stdio
+    container: "mcp/git"
+  time:
+    type: stdio
+    container: "mcp/time"
+  axiom:
+    type: stdio
+    container: "mcp/axiom"
+
 sandbox:
   mcp:
     container: "ghcr.io/github/gh-aw-mcpg:v0.0.94"
-    mcp-servers:
-      github:
-        type: stdio
-        container: "ghcr.io/github/github-mcp-server:v0.30.2"
-        env:
-          GITHUB_PERSONAL_ACCESS_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      filesystem:
-        type: stdio
-        container: "mcp/filesystem"
-        mounts:
-          - "/tmp/mcp-test-fs:/workspace:rw"
-      memory:
-        type: stdio
-        container: "mcp/memory"
-      sqlite:
-        type: stdio
-        container: "mcp/sqlite"
-      postgres:
-        type: stdio
-        container: "mcp/postgres"
-      brave-search:
-        type: stdio
-        container: "mcp/brave-search"
-      fetch:
-        type: stdio
-        container: "mcp/fetch"
-      puppeteer:
-        type: stdio
-        container: "mcp/puppeteer"
-      slack:
-        type: stdio
-        container: "mcp/slack"
-      gdrive:
-        type: stdio
-        container: "mcp/gdrive"
-      google-maps:
-        type: stdio
-        container: "mcp/google-maps"
-      everart:
-        type: stdio
-        container: "mcp/everart"
-      sequential-thinking:
-        type: stdio
-        container: "mcp/sequential-thinking"
-      aws-kb-retrieval:
-        type: stdio
-        container: "mcp/aws-kb-retrieval"
-      linear:
-        type: stdio
-        container: "mcp/linear"
-      sentry:
-        type: stdio
-        container: "mcp/sentry"
-      raygun:
-        type: stdio
-        container: "mcp/raygun"
-      git:
-        type: stdio
-        container: "mcp/git"
-      time:
-        type: stdio
-        container: "mcp/time"
-      axiom:
-        type: stdio
-        container: "mcp/axiom"
 
 safe-outputs:
   create-issue: