diff --git a/.github/agent-build-instructions.md b/.github/agent-build.instructions.md
similarity index 99%
rename from .github/agent-build-instructions.md
rename to .github/agent-build.instructions.md
index 2e6ef0a94b..6873303d69 100644
--- a/.github/agent-build-instructions.md
+++ b/.github/agent-build.instructions.md
@@ -1,3 +1,6 @@
+---
+applyTo: "**"
+---
 # Agent-Mode Build & Test Instructions
 
 Detailed build workflow, timeouts, and troubleshooting for making code changes in agent mode. Always reference these instructions first when running builds or validating changes.
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 5032c5d678..8829acf9f3 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -44,7 +44,7 @@ Always reference these instructions first and fallback to search or bash command
 **Build firmware to validate code changes**: `pio run -e esp32_4MB_V4_M` — must succeed, never skip this step.
 Common firmware environments: `esp32_4MB_V4_M`, `esp32_16MB_V4_S_HUB75`, `esp32S3_8MB_PSRAM_M_qspi`, `esp32_16MB_V4_M_eth`, `esp32dev_compat`, `esp8266_4MB_S` (deprecated)
 
-For detailed build timeouts, development workflows, troubleshooting, and validation steps, see [agent-build-instructions.md](agent-build-instructions.md).
+For detailed build timeouts, development workflows, troubleshooting, and validation steps, see [agent-build.instructions.md](agent-build.instructions.md).
 
 ## Repository Structure
 
diff --git a/.github/cpp.instructions.md b/.github/cpp.instructions.md
index 7cbf6ab751..2ada2aca1f 100644
--- a/.github/cpp.instructions.md
+++ b/.github/cpp.instructions.md
@@ -1,5 +1,5 @@
 ---
-applyTo: "**/*.cpp,**/*.h,**/*.hpp, **/*.ino"
+applyTo: "**/*.cpp,**/*.h,**/*.hpp,**/*.ino"
 ---
 # C++ Coding Conventions