diff --git a/.github/workflows/Build_Examples.yml b/.github/workflows/Build_Examples.yml
index ded75afe31a..1966291280e 100644
--- a/.github/workflows/Build_Examples.yml
+++ b/.github/workflows/Build_Examples.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Check branch
         if: ${{ github.ref == 'refs/heads/main' }}
-        id: check_watch
+        id: check_main_branch
         run: |
           echo "RUN_TEST=1" >> $GITHUB_OUTPUT
 
@@ -95,7 +95,7 @@ jobs:
           
       - name: Check watch files (powershell)
         if: ${{ github.ref != 'refs/heads/main' && matrix.os == 'windows-latest' }}
-        id: check_watch
+        id: check_watch_powershell
         run: |
           $RUN_TEST = 0
           # Always run test on workflow dispatch
@@ -133,12 +133,12 @@ jobs:
       - name: Install ARM GCC Toolchain (arm-none-eabi-gcc)
         uses: carlosperate/arm-none-eabi-gcc-action@v1
         id: arm-none-eabi-gcc-action
-        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' }}
+        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' || steps.check_main_branch.outputs.RUN_TEST == '1' || steps.check_powershell.outputs.RUN_TEST == '1' }}
         with:
           release: '10.3-2021.10' # <-- The compiler release to use
           
       - name: Install RISCV GCC Toolchain (riscv-none-embed-gcc)
-        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' }}
+        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' || steps.check_main_branch.outputs.RUN_TEST == '1' || steps.check_powershell.outputs.RUN_TEST == '1' }}
         run: |
           # Install RISCV tools
           npm install --global xpm@latest
@@ -151,7 +151,7 @@ jobs:
           echo "/home/runner/riscv-none-embed-gcc/$TOOL_VER/.content/bin" >> $GITHUB_PATH
 
       - name: Install RISCV GCC Toolchain (riscv-none-elf-gcc)
-        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' }}
+        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' || steps.check_main_branch.outputs.RUN_TEST == '1' || steps.check_powershell.outputs.RUN_TEST == '1' }}
         run: |
           # Install RISCV tools (updated)
           npm install --global xpm@latest