diff --git a/.github/agents/engineering.md b/.github/agents/engineering.md
deleted file mode 100644
index 1cfad832f7a..00000000000
--- a/.github/agents/engineering.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Engineering
-description: The VS Code Engineering Agent helps with engineering-related tasks in the VS Code repository.
-tools:
- - read/readFile
- - execute/getTerminalOutput
- - execute/runInTerminal
- - github/*
- - agent/runSubagent
----
-
-## Your Role
-
-You are the **VS Code Engineering Agent**. Your task is to perform engineering-related tasks in the VS Code repository by following the given prompt file's instructions precisely and completely. You must follow ALL guidelines and requirements written in the prompt file you are pointed to.
-
-If you cannot retrieve the given prompt file, provide a detailed error message indicating the underlying issue and do not attempt to complete the task.
-
-If a step in the given prompt file fails, provide a detailed error message indicating the underlying issue and do not attempt to complete the task.
diff --git a/.github/prompts/find-duplicates.prompt.md b/.github/prompts/find-duplicates.prompt.md
index 7bda0fd83af..4537750b16b 100644
--- a/.github/prompts/find-duplicates.prompt.md
+++ b/.github/prompts/find-duplicates.prompt.md
@@ -1,6 +1,6 @@
 ---
 # NOTE: This prompt is intended for internal use only for now.
-agent: Engineering
+agent: agent
 argument-hint: Provide a link or issue number to find duplicates for
 description: Find duplicates for a VS Code GitHub issue
 model: Claude Sonnet 4.5 (copilot)
@@ -12,5 +12,5 @@ tools:
 ---
 
 ## Your Task
-1. Use the GitHub MCP server to retrieve the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-duplicates-gh-cli.prompt.md.
+1. Get the file contents of the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-duplicates-gh-cli.prompt.md.
 2. Follow those instructions PRECISELY to identify potential duplicate issues for a given issue number in the VS Code repository.
diff --git a/.github/prompts/find-issue.prompt.md b/.github/prompts/find-issue.prompt.md
index dfdfdd56b69..32edf030e5b 100644
--- a/.github/prompts/find-issue.prompt.md
+++ b/.github/prompts/find-issue.prompt.md
@@ -1,6 +1,6 @@
 ---
 # ⚠️: Internal use only. To onboard, follow instructions at https://github.com/microsoft/vscode-engineering/blob/main/docs/gh-mcp-onboarding.md
-agent: Engineering
+agent: agent
 model: Claude Sonnet 4.5 (copilot)
 argument-hint: Describe your issue. Include relevant keywords or phrases.
 description: Search for an existing VS Code GitHub issue
@@ -10,5 +10,5 @@ tools:
 ---
 
 ## Your Task
-1. Use the GitHub MCP server to retrieve the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-issue.prompt.md.
+1. Get the file contents of the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-issue.prompt.md.
 2. Follow those instructions PRECISELY to find issues related to the issue description provided. Perform your search in the `vscode` repository.
diff --git a/.github/prompts/issue-grouping.prompt.md b/.github/prompts/issue-grouping.prompt.md
index 8f6bfea7660..ec91b12f1bb 100644
--- a/.github/prompts/issue-grouping.prompt.md
+++ b/.github/prompts/issue-grouping.prompt.md
@@ -1,5 +1,5 @@
 ---
-agent: Engineering
+agent: agent
 model: Claude Sonnet 4.5 (copilot)
 argument-hint: Give an assignee and or a label/labels. Issues with that assignee and label will be fetched and grouped.
 description: Group similar issues.