diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 7367eb9a79544..d0d0b6f881afc 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -104,7 +104,7 @@ jobs:
         run: |
 
           # Skip all macOS Builds
-          if [[ "${{ inputs.os }}" == "macOS" ]]; then
+          if [[ "${{ inputs.os }}" == "NOTUSED" ]]; then
             echo "Skipping all macOS Builds"
             echo "skip_all_builds=1" | tee -a $GITHUB_OUTPUT
             exit
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 443ad46db32ac..9ad2d8e5c2e3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,7 @@ on:
     paths-ignore:
       - 'Documentation/**'
     branches:
+      - master
       - 'releases/*'
     tags:
 
@@ -118,7 +119,7 @@ jobs:
 
   # Select the Linux Builds based on PR Arch Label
   Linux-Arch:
-    uses: apache/nuttx/.github/workflows/arch.yml@master
+    uses: NuttX/nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
       os: Linux
@@ -142,7 +143,7 @@ jobs:
       DOCKER_BUILDKIT: 1
 
     strategy:
-      max-parallel: 12
+      fail-fast: false
       matrix:
         boards: ${{ fromJSON(needs.Linux-Arch.outputs.selected_builds) }}
 
@@ -197,7 +198,7 @@ jobs:
 
   # Select the macOS Builds based on PR Arch Label
   macOS-Arch:
-    uses: apache/nuttx/.github/workflows/arch.yml@master
+    uses: NuttX/nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
       os: macOS
@@ -212,7 +213,7 @@ jobs:
     needs: macOS-Arch
     if: ${{ needs.macOS-Arch.outputs.skip_all_builds != '1' }}
     strategy:
-      max-parallel: 2
+      fail-fast: false
       matrix:
         boards: ${{ fromJSON(needs.macOS-Arch.outputs.selected_builds) }}
     steps:
@@ -257,7 +258,7 @@ jobs:
 
   # Select the msys2 Builds based on PR Arch Label
   msys2-Arch:
-    uses: apache/nuttx/.github/workflows/arch.yml@master
+    uses: NuttX/nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
       os: msys2
@@ -338,7 +339,7 @@ jobs:
 
   # Select the msvc Builds based on PR Arch Label
   msvc-Arch:
-    uses: apache/nuttx/.github/workflows/arch.yml@master
+    uses: NuttX/nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
       os: msvc