diff --git a/.appveyor.yml b/.appveyor.yml
index 543f2201..535e191d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,7 @@ build:
   parallel: true
   verbosity: minimal
 skip_branch_with_pr: true
+image: Visual Studio 2019
 
 environment:
   global:
@@ -14,12 +15,12 @@ environment:
     PYPI_PASS:
       secure: uXkrTaPGSNQdXTJIt3aiyyGnH/ZtvWbDVIXdMrsgwROIJ0kprWp5crS6TAqqddyrFxd7Trrfjg/TjM1/Yx9JzfuKTfoJh1zyviWD/j2zibsycmJQy4Q+CrZ6uI3IRQwe/2ILKxGzLGFBWaqt6C8NaQnkKP+h7ptnPeVhy1+kaOaJowwrCKWje1Ag3CJCAJxPjSC8yl1nlM3DA1rAIk2C5SR4eQQLJeEpPSg3nDnxR4o4YjmA7ILD3OuM1Fbh5iue/rUvWzdt6QCxCbE4egtrCQ==
     # Default python version to run single commands with
-    PYTHON_DEF: "C:\\Python36-x64"
-    PYTHON_VERSION: "3.6"
+    PYTHON_DEF: "C:\\Python38-x64"
+    PYTHON_VERSION: "3.8"
     # Python versions to build wheels for
-    PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64
+    PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64 C:\Python39-x64
     PYTHON_ARCH: "64"
-    MSVC: "Visual Studio 14 Win64"
+    MSVC: "Visual Studio 16 2019"
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
index abf95f0f..f6331af2 100755
--- a/ci/appveyor/build_ssh2.bat
+++ b/ci/appveyor/build_ssh2.bat
@@ -6,6 +6,7 @@ cmake ..\libssh2 -G "NMake Makefiles"         ^
        -DCMAKE_BUILD_TYPE=Release             ^
        -DCRYPTO_BACKEND=OpenSSL               ^
        -G"%MSVC%"                             ^
+       -A x64                                 ^
        -DBUILD_SHARED_LIBS=OFF                ^
        -DENABLE_ZLIB_COMPRESSION=ON           ^
        -DENABLE_CRYPT_NONE=ON                 ^
diff --git a/ci/appveyor/build_zlib.bat b/ci/appveyor/build_zlib.bat
index f0fd01d9..f11fe412 100755
--- a/ci/appveyor/build_zlib.bat
+++ b/ci/appveyor/build_zlib.bat
@@ -1,18 +1,12 @@
+IF "%PYTHON_VERSION%" == "2.7" (exit 0)
+
 mkdir zlib_build && cd zlib_build
 
-IF "%MSVC%" == "Visual Studio 9" (
-   ECHO "Building without platform set"
-   cmake ..\zlib-1.2.11 -G "NMake Makefiles"        ^
-       -DCMAKE_INSTALL_PREFIX="C:\zlib"             ^
-       -DCMAKE_BUILD_TYPE=Release                   ^
-       -DBUILD_SHARED_LIBS=OFF
-) ELSE (
-   ECHO "Building with platform %MSVC%"
-   cmake ..\zlib-1.2.11                             ^
-       -G"%MSVC%"                                   ^
-       -DCMAKE_INSTALL_PREFIX="C:\zlib"             ^
-       -DCMAKE_BUILD_TYPE=Release                   ^
-       -DBUILD_SHARED_LIBS=OFF
+cmake ..\zlib-1.2.11                             ^
+    -A x64                                       ^
+    -DCMAKE_INSTALL_PREFIX="C:\zlib"             ^
+    -DCMAKE_BUILD_TYPE=Release                   ^
+    -DBUILD_SHARED_LIBS=OFF
 )
 
 cmake --build . --config Release --target install