diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 9c34071a3afe3..1f72084de970a 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -42,10 +42,16 @@ jobs:
             exit
           fi
 
+          # Ignore the Label "Area: Documentation", because it won't affect the Build Targets
+          query='.labels | map(select(.name != "Area: Documentation")) | '
+          select_name='.[].name'
+          select_length='length'
+
           # Get the Labels for the PR: "Arch: risc-v \n Board: risc-v \n Size: XS"
           # If GitHub CLI Fails: Build all targets
-          labels=$(gh pr view $pr --repo $GITHUB_REPOSITORY --json labels --jq '.labels[] | .name' || echo "")
-          numlabels=$(gh pr view $pr --repo $GITHUB_REPOSITORY --json labels --jq '.[] | length' || echo "")
+          labels=$(gh pr view $pr --repo $GITHUB_REPOSITORY --json labels --jq "$query$select_name" || echo "")
+          numlabels=$(gh pr view $pr --repo $GITHUB_REPOSITORY --json labels --jq "$query$select_length" || echo "")
+          echo "labels=$labels"
           echo "numlabels=$numlabels" | tee -a $GITHUB_OUTPUT
 
           # Identify the Size, Arch and Board Labels
@@ -190,37 +196,37 @@ jobs:
             
             # For "Arch / Board: arm": Build arm-01, arm-02, ...
             if [[ "$arch_contains_arm" == "1" || "$board_contains_arm" == "1" ]]; then
-              if [[ "$board" != *"arm"* ]]; then
+              if [[ "$board" != *"arm-"* ]]; then
                 skip_build=1
               fi
 
-            # For "Arch / Board: arm64": Build other
+            # For "Arch / Board: arm64": Build arm64-01
             elif [[ "$arch_contains_arm64" == "1" || "$board_contains_arm64" == "1" ]]; then
-              if [[ "$board" != *"other"* ]]; then
+              if [[ "$board" != *"arm64-"* ]]; then
                 skip_build=1
               fi
 
-            # For "Arch / Board: risc-v": Build risc-v-01, risc-v-02
+            # For "Arch / Board: risc-v": Build risc-v-01, risc-v-02, ...
             elif [[ "$arch_contains_riscv" == "1" || "$board_contains_riscv" == "1" ]]; then
-              if [[ "$board" != *"risc-v"* ]]; then
+              if [[ "$board" != *"risc-v-"* ]]; then
                 skip_build=1
               fi
   
             # For "Arch / Board: simulator": Build sim-01, sim-02
             elif [[ "$arch_contains_sim" == "1" || "$board_contains_sim" == "1" ]]; then
-              if [[ "$board" != *"sim"* ]]; then
+              if [[ "$board" != *"sim-"* ]]; then
                 skip_build=1
               fi
 
-            # For "Arch / Board: x86_64": Build other
+            # For "Arch / Board: x86_64": Build x86_64-01
             elif [[ "$arch_contains_x86_64" == "1" || "$board_contains_x86_64" == "1" ]]; then
-              if [[ "$board" != *"other"* ]]; then
+              if [[ "$board" != *"x86_64-"* ]]; then
                 skip_build=1
               fi
   
             # For "Arch / Board: xtensa": Build xtensa-01, xtensa-02
             elif [[ "$arch_contains_xtensa" == "1" || "$board_contains_xtensa" == "1" ]]; then
-              if [[ "$board" != *"xtensa"* ]]; then
+              if [[ "$board" != *"xtensa-"* ]]; then
                 skip_build=1
               fi
   
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 562d3dbded1f0..41888df3a8f2d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,7 +125,7 @@ jobs:
       os: Linux
       boards: |
         [
-          "arm-01", "other", "risc-v-01", "sim-01", "xtensa-01",
+          "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",
           "arm-04", "risc-v-04",
diff --git a/tools/ci/testlist/arm64-01.dat b/tools/ci/testlist/arm64-01.dat
new file mode 100644
index 0000000000000..04481299cf0b8
--- /dev/null
+++ b/tools/ci/testlist/arm64-01.dat
@@ -0,0 +1,11 @@
+/arm64
+
+# arm64 Boards build by CMake
+CMake,qemu-armv8a:citest
+CMake,qemu-armv8a:citest_smp
+CMake,qemu-armv8a:nsh
+CMake,qemu-armv8a:nsh_fiq
+CMake,qemu-armv8a:nsh_gicv2
+CMake,qemu-armv8a:nsh_smp
+CMake,qemu-armv8a:nsh_smp_tickless
+CMake,qemu-armv8a:sotest
diff --git a/tools/ci/testlist/other.dat b/tools/ci/testlist/other.dat
index 17b9d06871935..ad72ddf59aa56 100644
--- a/tools/ci/testlist/other.dat
+++ b/tools/ci/testlist/other.dat
@@ -11,22 +11,6 @@
 
 /x86
 
-# x86_64-elf-gcc from homebrew doesn't seem to
-# provide __udivdi3 etc for -m32
-/x86_64
-
 # Sparc-gaisler-elf toolchain doesn't provide macOS binaries
 /sparc
 -xx3823:nsh
-
-/arm64
-
-# arm64 Boards build by CMake
-CMake,qemu-armv8a:citest
-CMake,qemu-armv8a:citest_smp
-CMake,qemu-armv8a:nsh
-CMake,qemu-armv8a:nsh_fiq
-CMake,qemu-armv8a:nsh_gicv2
-CMake,qemu-armv8a:nsh_smp
-CMake,qemu-armv8a:nsh_smp_tickless
-CMake,qemu-armv8a:sotest
diff --git a/tools/ci/testlist/x86_64-01.dat b/tools/ci/testlist/x86_64-01.dat
new file mode 100644
index 0000000000000..1c32224582a75
--- /dev/null
+++ b/tools/ci/testlist/x86_64-01.dat
@@ -0,0 +1,3 @@
+# x86_64-elf-gcc from homebrew doesn't seem to
+# provide __udivdi3 etc for -m32
+/x86_64