diff --git a/.github/workflows/build-llvm.yaml b/.github/workflows/build-llvm.yaml
index 8d105c6..3846544 100644
--- a/.github/workflows/build-llvm.yaml
+++ b/.github/workflows/build-llvm.yaml
@@ -13,7 +13,7 @@ jobs:
     name: Build LLVM
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-14]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-14]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
diff --git a/build-llvm-libs.sh b/build-llvm-libs.sh
index 4a325ab..6fdb6c3 100755
--- a/build-llvm-libs.sh
+++ b/build-llvm-libs.sh
@@ -13,10 +13,15 @@ fi
 CC=clang
 CXX=clang++
 
-TARGET_PLATFORM=X86
-if [ "$(uname)" == "Darwin" ]; then
-  # On Mac we only support the new apple silicon architecture.
+ARCH=$(uname -m)
+
+if [ "$ARCH" == "x86_64" ]; then
+  TARGET_PLATFORM=X86
+elif [ "$ARCH" == "arm64" ] || [ "$ARCH" == "aarch64" ]; then
   TARGET_PLATFORM=AArch64
+else
+  echo "Unsupported architecture: $ARCH"
+  exit 1
 fi
 
 cd "$SCRIPT_DIR"