diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 420462ed6..b25ccb460 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -50,7 +50,8 @@ body:
       multiple: true
       options:
         - Linux
-        - macOS
+        - macOS - aarch64
+        - macOS - Intel
         - Windows
     validations:
       required: true
diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index 0de6e518d..955094254 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -175,7 +175,7 @@ jobs:
         run: |
           mv ./zen.win64.zip zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
           mv ./dist/output.mar windows${{ matrix.generic == true && '-generic' || '' }}.mar
-          mv ./dist/zen.installer.exe ./dist/zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -203,7 +203,7 @@ jobs:
         if: ${{ !inputs.generate-gpo }}
         with:
           name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
-          path: ./dist/zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          path: ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
 
       - name: Upload installer stub
         uses: actions/upload-artifact@v4
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 63ce1b4d0..bcf0ccd23 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -14,22 +14,22 @@ if test "$SURFER_COMPAT" = "true"; then
     ac_add_options --target=x86_64-apple-darwin
 
     ac_add_options --enable-wasm-avx
-    ac_add_options --enable-optimize="-O3 -march=x86-64-v3"
+    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
 
     export CFLAGS="-O3 -march=x86-64-v3"
     export CPPFLAGS="-O3 -march=x86-64-v3"
     export CXXFLAGS="-O3 -march=x86-64-v3"
     export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
-    export RUSTFLAGS="-C target-feature=+avx2 -C codegen-units=1"
+    export RUSTFLAGS="-Ctarget-cpu=nehalem -C codegen-units=1"
 else
     ac_add_options --target=aarch64-apple-darwin
 
-    ac_add_options --enable-optimize="-O3 -march=armv8.3-a+simd"
+    ac_add_options --enable-optimize="-O3 -mcpu=apple-m1 -march=armv8.3-a+simd"
 
-    export CFLAGS="-O3 -march=armv8.3-a+simd"
-    export CPPFLAGS="-O3 -march=armv8.3-a+simd"
-    export CXXFLAGS="-O3 -march=armv8.3-a+simd"
-    export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd"
-    export RUSTFLAGS="-C target-feature=+v8.3a -C codegen-units=1"
+    export CFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export CPPFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export CXXFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export RUSTFLAGS="-C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1"
 fi
 export VERBOSE=1