diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 02e39ab2b54..f4d84d9b1c4 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -9,7 +9,7 @@ on:
         required: true
         type: string
       boards:
-        description: "List of All Builds: [arm-01, risc-v-01, xtensa-01, ...]"
+        description: "List of All Builds: [arm-imx, risc-v-01, xtensa-01, ...]"
         required: true
         type: string
     outputs:
@@ -17,7 +17,7 @@ on:
         description: "Set to 1 if all builds should be skipped"
         value: ${{ jobs.Select-Builds.outputs.skip_all_builds }}
       selected_builds:
-        description: "Selected Builds for the PR: [arm-01, risc-v-01, xtensa-01, ...]"
+        description: "Selected Builds for the PR: [arm-imx, risc-v-01, xtensa-01, ...]"
         value: ${{ jobs.Select-Builds.outputs.selected_builds }}
 
 jobs:
@@ -102,7 +102,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Select the Builds for the PR: arm-01, risc-v-01, xtensa-01, ...
+      # Select the Builds for the PR: arm-imx, risc-v-01, xtensa-01, ...
       - name: Select builds
         id: select-builds
         run: |
@@ -134,7 +134,7 @@ jobs:
           board_contains_x86_64=${{ steps.get-arch.outputs.board_contains_x86_64 }}
           board_contains_xtensa=${{ steps.get-arch.outputs.board_contains_xtensa }}
 
-          # inputs.boards is a JSON Array: ["arm-01", "risc-v-01", "xtensa-01", ...]
+          # inputs.boards is a JSON Array: ["arm-imx", "risc-v-01", "xtensa-01", ...]
           # We compact and remove the newlines
           boards=$( echo '${{ inputs.boards }}' | jq --compact-output ".")
           numboards=$( echo "$boards" | jq "length" )
@@ -194,7 +194,7 @@ jobs:
             board=$( echo "$boards" | jq ".[$i]" )
             skip_build=0
             
-            # For "Arch / Board: arm": Build arm-01, arm-02, ...
+            # For "Arch / Board: arm": Build arm-*
             if [[ "$arch_contains_arm" == "1" || "$board_contains_arm" == "1" ]]; then
               if [[ "$board" != *"arm-"* ]]; then
                 skip_build=1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f4c7014e1e..d9ab7eae1b1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -296,19 +296,20 @@ jobs:
 
   # Select the Linux Builds based on PR Arch Label
   Linux-Arch:
-    uses: apache/nuttx-apps/.github/workflows/arch.yml@master
+    uses: ./.github/workflows/arch.yml
     needs: Fetch-Source
     with:
       os: Linux
       boards: |
         [
-          "arm-01", "risc-v-01", "sim-01", "xtensa-01", "arm64-01", "x86_64-01", "other",
-          "arm-02", "risc-v-02", "sim-02", "xtensa-02",
-          "arm-03", "risc-v-03", "sim-03", "xtensa-03",
-          "arm-04", "risc-v-04",
-          "arm-05", "risc-v-05",
-          "arm-06", "risc-v-06",
-          "arm-07", "arm-08", "arm-09", "arm-10", "arm-11", "arm-12", "arm-13", "arm-14"
+          "arm-imx", "risc-v-01", "sim-01", "xtensa-01", "arm64-01", "x86_64-01", "other",
+          "arm-nrf", "risc-v-02", "sim-02", "xtensa-02",
+          "arm-nxp", "risc-v-03", "sim-03", "xtensa-03",
+          "arm-rp2xxx", "risc-v-04",
+          "arm-sam", "risc-v-05",
+          "arm-ti", "risc-v-06",
+          "arm-stm32f4-1", "arm-stm32f4-2", "arm-stm32f0-f3", "arm-stm32h7",
+          "arm-stm32l-u-g", "arm-stm32-other", "arm-other"
         ]
 
   # Run the selected Linux Builds
@@ -470,7 +471,7 @@ jobs:
 
   # Select the macOS Builds based on PR Arch Label
   macOS-Arch:
-    uses: apache/nuttx-apps/.github/workflows/arch.yml@master
+    uses: ./.github/workflows/arch.yml
     needs: Fetch-Source
     with:
       os: macOS
@@ -533,7 +534,7 @@ jobs:
 
   # Select the msys2 Builds based on PR Arch Label
   msys2-Arch:
-    uses: apache/nuttx-apps/.github/workflows/arch.yml@master
+    uses: ./.github/workflows/arch.yml
     needs: Fetch-Source
     with:
       os: msys2
@@ -617,7 +618,7 @@ jobs:
 
   # Select the msvc Builds based on PR Arch Label
   msvc-Arch:
-    uses: apache/nuttx-apps/.github/workflows/arch.yml@master
+    uses: ./.github/workflows/arch.yml
     needs: Fetch-Source
     with:
       os: msvc