diff --git a/.github/workflows/build_all_targets.yml b/.github/workflows/build_all_targets.yml
index 906cb76f0a..cef95de65c 100644
--- a/.github/workflows/build_all_targets.yml
+++ b/.github/workflows/build_all_targets.yml
@@ -70,7 +70,7 @@ jobs:
   setup:
     name: Build Group [${{ matrix.group }}][${{ matrix.arch == 'nuttx' && 'x86' || 'arm64' }}]
     # runs-on: ubuntu-latest
-    runs-on: [runs-on,"runner=8cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,"runner=8cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",spot=false]
     needs: group_targets
     strategy:
       matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }}
diff --git a/Tools/ci/generate_board_targets_json.py b/Tools/ci/generate_board_targets_json.py
index 8a6c26df73..961345377d 100755
--- a/Tools/ci/generate_board_targets_json.py
+++ b/Tools/ci/generate_board_targets_json.py
@@ -214,6 +214,7 @@ if (args.group):
     if(verbose):
         print(f'=:Architectures: [{grouped_targets.keys()}]')
     for arch in grouped_targets:
+        runner = 'x64' if arch == 'nuttx' else 'arm64'
         if(verbose):
             print(f'=:Processing: [{arch}]')
         temp_group = []
@@ -231,6 +232,7 @@ if (args.group):
                     "container": grouped_targets[arch]['container'],
                     "targets": targets,
                     "arch": arch,
+                    "runner": runner,
                     "group": group_name,
                     "len": len(grouped_targets[arch]['manufacturers'][man])
                 })
@@ -248,6 +250,7 @@ if (args.group):
                         "container": grouped_targets[arch]['container'],
                         "targets": targets,
                         "arch": arch,
+                        "runner": runner,
                         "group": group_name,
                         "len": len(chunk),
                     })
@@ -268,6 +271,7 @@ if (args.group):
                 "container": grouped_targets[arch]['container'],
                 "targets": targets,
                 "arch": arch,
+                "runner": runner,
                 "group": group_name,
                 "len": temp_len
             })
@@ -285,6 +289,7 @@ if (args.group):
                     "container": grouped_targets[arch]['container'],
                     "targets": targets,
                     "arch": arch,
+                    "runner": runner,
                     "group": group_name,
                     "len": len(chunk),
                 })