diff --git a/eng/tools/ToolDescriptionEvaluator/prompts/consolidated-prompts.json b/eng/tools/ToolDescriptionEvaluator/prompts/consolidated-prompts.json
index 4a266e89f0..ad335b07d4 100644
--- a/eng/tools/ToolDescriptionEvaluator/prompts/consolidated-prompts.json
+++ b/eng/tools/ToolDescriptionEvaluator/prompts/consolidated-prompts.json
@@ -298,8 +298,7 @@
     "Generate the azure architecture diagram for this application",
     "Help me design an Azure cloud service that will serve as an ATM for users",
     "How can I design a cloud service in Azure that will store and present videos for users?",
-    "I want to design a cloud app for ordering groceries",
-    "Please help me design an architecture for a large-scale file upload, storage, and retrieval service"
+    "I want to design a cloud app for ordering groceries"
   ],
   "get_azure_load_testing_details": [
     "Get all the load test runs for the test with id <test-id> in the load test resource <test-resource> in resource group <resource-group>",
@@ -583,4 +582,4 @@
     "Transcribe speech from audio file <file_path> with profanity filtering",
     "Transcribe the audio file <file_path> in Spanish language"
   ]
-}
\ No newline at end of file
+}
diff --git a/eng/tools/ToolDescriptionEvaluator/prompts/prompts.json b/eng/tools/ToolDescriptionEvaluator/prompts/prompts.json
index c415d871d2..aea8612e77 100644
--- a/eng/tools/ToolDescriptionEvaluator/prompts/prompts.json
+++ b/eng/tools/ToolDescriptionEvaluator/prompts/prompts.json
@@ -813,7 +813,6 @@
     "How can I use Bicep to create an Azure OpenAI service?"
   ],
   "cloudarchitect_design": [
-    "Please help me design an architecture for a large-scale file upload, storage, and retrieval service",
     "Help me design an Azure cloud service that will serve as an ATM for users",
     "I want to design a cloud app for ordering groceries",
     "How can I design a cloud service in Azure that will store and present videos for users?"
@@ -852,7 +851,7 @@
   "foundry_models_list": [
     "List all Microsoft Foundry models",
     "Show me the available Microsoft Foundry models"
-  ],  
+  ],
   "foundryextensions_openai_chat-completions-create": [
     "Create a chat completion with the message \"Hello, how are you today?\" using my Microsoft Foundry resource"
   ],
@@ -877,4 +876,4 @@
     "Show me Advisor recommendations in the subscription <subscription>",
     "List all Advisor recommendations in the subscription <subscription>"
   ]
-}
\ No newline at end of file
+}
diff --git a/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md b/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md
index 70c6ad789c..ec47640009 100644
--- a/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md
+++ b/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md
@@ -1232,7 +1232,6 @@ This file contains prompts used for end-to-end testing to ensure each tool is in
 
 | Tool Name | Test Prompt |
 |:----------|:----------|
-| cloudarchitect_design | Please help me design an architecture for a large-scale file upload, storage, and retrieval service |
 | cloudarchitect_design | Help me design an Azure cloud service that will serve as an ATM for users |
 | cloudarchitect_design | I want to design a cloud app for ordering groceries |
 | cloudarchitect_design | How can I design a cloud service in Azure that will store and present videos for users? |