diff --git a/.github/workflows/nightly-mcp-stress-test.lock.yml b/.github/workflows/nightly-mcp-stress-test.lock.yml
index b1f4f410..a04c0b1c 100644
--- a/.github/workflows/nightly-mcp-stress-test.lock.yml
+++ b/.github/workflows/nightly-mcp-stress-test.lock.yml
@@ -21,7 +21,7 @@
 #
 # Load 20 MCP servers, discover and summarize the tools exported by each server, test tool invocations, and post a comprehensive report as a GitHub issue
 #
-# frontmatter-hash: 67e90c59d605d5683a5f2906a7a16e3d6a7a0c1041e10d2945ddd4e1209dbba5
+# frontmatter-hash: 5c7716937953d0d780cd12fc0bbbbedb6300042980bcce4a2bb2dc74f0ab2f38
 
 name: "Nightly MCP Server Stress Test"
 "on":
@@ -402,16 +402,16 @@ jobs:
           cat << MCPCONFIG_EOF | bash /opt/gh-aw/actions/start_mcp_gateway.sh
           {
             "mcpServers": {
-              "atlassian": {
+              "brave-search": {
                 "type": "stdio",
-                "container": "mcp/hackernews-mcp",
+                "container": "mcp/brave-search",
                 "tools": [
                   "*"
                 ]
               },
-              "brave-search": {
+              "duckduckgo": {
                 "type": "stdio",
-                "container": "mcp/brave-search",
+                "container": "mcp/duckduckgo",
                 "tools": [
                   "*"
                 ]
@@ -464,16 +464,16 @@ jobs:
                   "GITHUB_TOOLSETS": "context,repos,issues,pull_requests"
                 }
               },
-              "gitlab": {
+              "google-maps": {
                 "type": "stdio",
-                "container": "mcp/wikipedia-mcp",
+                "container": "mcp/google-maps",
                 "tools": [
                   "*"
                 ]
               },
-              "google-maps": {
+              "hackernews": {
                 "type": "stdio",
-                "container": "mcp/google-maps",
+                "container": "mcp/hackernews-mcp",
                 "tools": [
                   "*"
                 ]
@@ -492,13 +492,6 @@ jobs:
                   "*"
                 ]
               },
-              "notion": {
-                "type": "stdio",
-                "container": "mcp/duckduckgo",
-                "tools": [
-                  "*"
-                ]
-              },
               "playwright": {
                 "type": "stdio",
                 "container": "mcr.microsoft.com/playwright/mcp",
@@ -555,6 +548,13 @@ jobs:
                   "*"
                 ]
               },
+              "wikipedia": {
+                "type": "stdio",
+                "container": "mcp/wikipedia-mcp",
+                "tools": [
+                  "*"
+                ]
+              },
               "youtube-transcript": {
                 "type": "stdio",
                 "container": "mcp/youtube-transcript",
diff --git a/.github/workflows/nightly-mcp-stress-test.md b/.github/workflows/nightly-mcp-stress-test.md
index 6ef2c88d..63686902 100644
--- a/.github/workflows/nightly-mcp-stress-test.md
+++ b/.github/workflows/nightly-mcp-stress-test.md
@@ -77,16 +77,16 @@ mcp-servers:
   playwright:
     type: stdio
     container: "mcp/playwright"
-  gitlab:
+  wikipedia:
     type: stdio
     container: "mcp/wikipedia-mcp"
-  notion:
+  duckduckgo:
     type: stdio
     container: "mcp/duckduckgo"
   youtube-transcript:
     type: stdio
     container: "mcp/youtube-transcript"
-  atlassian:
+  hackernews:
     type: stdio
     container: "mcp/hackernews-mcp"
   kubernetes: