diff --git a/appveyor.yml b/appveyor.yml
index 1df6df1b..3a21b6de 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,40 +8,35 @@ skip_tags: true
 os: Visual Studio 2015
 shallow_clone: true
 clone_depth: 1
+
 environment:
   MSYS2_PATH_TYPE: inherit
   CHERE_INVOKING: enabled_from_arguments
   matrix:
-  - type: static
-    x64: 1
-  - type: static
-    x64: 0
+  - MSYSTEM: MINGW64
+  - MSYSTEM: MINGW32
+
 install:
-- if "%x64%"=="1" (
-    set "bitness=64"
-    set "MSYSTEM=MINGW64"
-  ) else (
-    set "bitness=32"
-    set "MSYSTEM=MINGW32"
-  )
-- if "%x64%" == "1" (
+- if "%MSYSTEM%" == "MINGW64" (
     C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Su mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-miniupnpc"
   ) else (
     C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Su mingw-w64-i686-boost mingw-w64-i386-openssl mingw-w64-i686-miniupnpc"
   )
+
 build_script:
 - cmd: >-
     cd \projects\i2pd
 
-    echo "bitness=%bitness%; type=%type%; variant=%variant%"
-- if "%x64%" == "1"(
+    echo "MSYSTEM=%bitness%"
+- if "%MSYSTEM%" == "MINGW64"(
     C:\msys64\usr\bin\bash -lc "make USE_UPNP=YES -I/mingw64/include/"
   ) else (
     C:\msys64\usr\bin\bash -lc "make USE_UPNP=YES -I/mingw32/include/"
   )
-
 - cmd: 7z a -tzip -mx9 -mmt i2pd-mingw-win%bitness%.zip i2pd.exe
+
 test: off
+
 artifacts:
 - path: i2pd-mingw-win64.zip
-- path: i2pd-mingw-win32.zip
\ No newline at end of file
+- path: i2pd-mingw-win32.zip