diff --git a/appveyor.yml b/appveyor.yml
index 782023d08..ef1f09b9c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 version: build-{build}
 clone_folder: c:\projects\janet
 image:
-- Visual Studio 2017
+- Visual Studio 2019
 configuration:
 - Release
 - Debug
@@ -15,7 +15,7 @@ matrix:
 
 # skip unsupported combinations
 init:
-- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
 
 install:
     - choco install nsis -y -pre
@@ -25,7 +25,7 @@ install:
     - build_win all
     - refreshenv
     # We need to reload vcvars after refreshing
-    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+    - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
     - build_win test-install
 build: off
 
diff --git a/janet-installer.nsi b/janet-installer.nsi
index f98bb9f73..b9f9f0f86 100644
--- a/janet-installer.nsi
+++ b/janet-installer.nsi
@@ -8,13 +8,15 @@ VIFileVersion "${PRODUCT_VERSION}"
 !define MULTIUSER_EXECUTIONLEVEL Highest
 !define MULTIUSER_MUI
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
-!define MULTIUSER_USE_PROGRAMFILES64
 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\Janet\${VERSION}"
 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME ""
 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\Janet\${VERSION}"
 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
 !define MULTIUSER_INSTALLMODE_INSTDIR "Janet-${VERSION}"
 
+# For now, use 32 bit folder as build is 32 bit
+# !define MULTIUSER_USE_PROGRAMFILES64
+
 # Includes
 !include "MultiUser.nsh"
 !include "MUI2.nsh"
@@ -189,4 +191,4 @@ section "uninstall"
     # Remove uninstaller information from the registry
     DeleteRegKey SHCTX "${UNINST_KEY}"
 
-sectionEnd
\ No newline at end of file
+sectionEnd