diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 966765eefa3b3..fafb33c8a4a2a 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -97,6 +97,13 @@ jobs:
         id: select-builds
         run: |
 
+          # Skip all macOS and Windows Builds
+          if [[ "${{ inputs.os }}" != "Linux" ]]; then
+            echo "Skipping all macOS and Windows Builds"
+            echo "skip_all_builds=1" | tee -a $GITHUB_OUTPUT
+            exit
+          fi
+
           # Fetch the outputs from the previous step
           numlabels=${{ steps.get-arch.outputs.numlabels }}
           labels_contain_size=${{ steps.get-arch.outputs.labels_contain_size }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de802ef83f79a..562d3dbded1f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -200,7 +200,7 @@ jobs:
     uses: apache/nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
-      os: Linux
+      os: macOS
       boards: |
         ["macos", "sim-01", "sim-02"]
 
@@ -260,7 +260,7 @@ jobs:
     uses: apache/nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
-      os: Linux
+      os: msys2
       boards: |
         ["msys2"]