diff --git a/.appveyor.yml b/.appveyor.yml
index 79d0cc3b4b..556c56461a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,6 +2,14 @@ branches:
   except:
     - dev
 version: '{build}'
+environment:
+  matrix:
+    - platform: x64
+      EXTRA_FLAGS: target_cpu="x64"
+      BUILD_NAME: naiveproxy-$(APPVEYOR_REPO_TAG_NAME)-win64
+    - platform: x86
+      EXTRA_FLAGS: target_cpu="x86"
+      BUILD_NAME: naiveproxy-$(APPVEYOR_REPO_TAG_NAME)-win32
 platform:
   - x64
   - x86
@@ -15,9 +23,8 @@ build_script:
   - bash ./tools/import-upstream.sh
   - bash -c 'cd src; ./get-clang.sh'
   - bash -c '~/.cargo/bin/sccache -s'
-  - bash -c 'cd src; EXTRA_FLAGS=target_cpu=\"$PLATFORM\" ./build.sh'
+  - bash -c 'cd src; ./build.sh'
   - bash -c '~/.cargo/bin/sccache -s'
-  - ps: $env:BUILD_NAME="naiveproxy-$env:APPVEYOR_REPO_TAG_NAME-win64"
   - bash -c 'mkdir $BUILD_NAME'
   - bash -c 'cp src/out/Release/naive.exe src/config.json LICENSE USAGE.txt $BUILD_NAME'
   - bash -c '7z a $BUILD_NAME.zip $BUILD_NAME'