diff --git a/.github/workflows/pake-cli.yaml b/.github/workflows/pake-cli.yaml
index f4fe9a3..193634e 100644
--- a/.github/workflows/pake-cli.yaml
+++ b/.github/workflows/pake-cli.yaml
@@ -89,6 +89,11 @@ jobs:
         with:
           toolchain: stable
           target: x86_64-apple-darwin
+          
+      - name: Add additional Rust target for multi-arch
+        if: inputs.platform == 'macos-latest' && inputs.multi_arch == true
+        run: |
+          rustup target add aarch64-apple-darwin
 
       - name: Install dependencies (ubuntu only)
         if: inputs.platform == 'ubuntu-24.04'
@@ -121,6 +126,7 @@ jobs:
           npm install axios
 
       - name: Build with pake-cli
+        timeout-minutes: 15
         run: |
           node ./script/build_with_pake_cli.js
         env:
diff --git a/script/build_with_pake_cli.js b/script/build_with_pake_cli.js
index 9a41985..0d5f506 100644
--- a/script/build_with_pake_cli.js
+++ b/script/build_with_pake_cli.js
@@ -96,9 +96,7 @@ const main = async () => {
 
     let params = buildParameters();
 
-    if (process.env.MULTI_ARCH === "true") {
-      await execa("rustup", ["target", "add", "aarch64-apple-darwin"]);
-    }
+    // Multi-arch target is now handled in GitHub Actions workflow
 
     if (process.env.ICON && process.env.ICON !== "") {
       const iconFile = getIconFileName();