diff --git a/Scripts/compile_and_run.sh b/Scripts/compile_and_run.sh
index 13544fba6..6597dffa0 100755
--- a/Scripts/compile_and_run.sh
+++ b/Scripts/compile_and_run.sh
@@ -195,8 +195,8 @@ fi
 if [[ "${DEBUG_LLDB}" == "1" && -n "${RELEASE_ARCHES}" ]]; then
   fail "--release-arches is only supported for release packaging"
 fi
-HOST_ARCH="$(uname -m)"
-ARCHES_VALUE="${HOST_ARCH}"
+# Build universal binary by default (arm64 + x86_64)
+ARCHES_VALUE="arm64 x86_64"
 if [[ -n "${RELEASE_ARCHES}" ]]; then
   ARCHES_VALUE="${RELEASE_ARCHES}"
 fi
diff --git a/Scripts/package_app.sh b/Scripts/package_app.sh
index a6a3754b7..bb26c534c 100755
--- a/Scripts/package_app.sh
+++ b/Scripts/package_app.sh
@@ -23,15 +23,10 @@ if [[ "${CODEXBAR_FORCE_CLEAN:-0}" == "1" ]]; then
   swift package clean >/dev/null 2>&1 || true
 fi
 
-# Build for host architecture by default; allow overriding via ARCHES (e.g., "arm64 x86_64" for universal).
+# Build universal binary by default (arm64 + x86_64); allow overriding via ARCHES.
 ARCH_LIST=( ${ARCHES:-} )
 if [[ ${#ARCH_LIST[@]} -eq 0 ]]; then
-  HOST_ARCH=$(uname -m)
-  case "$HOST_ARCH" in
-    arm64) ARCH_LIST=(arm64) ;;
-    x86_64) ARCH_LIST=(x86_64) ;;
-    *) ARCH_LIST=("$HOST_ARCH") ;;
-  esac
+  ARCH_LIST=(arm64 x86_64)
 fi
 
 patch_keyboard_shortcuts() {