diff --git a/.appveyor.yml b/.appveyor.yml
index f5e6ef7..ed0c6ab 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,55 +1,20 @@
 version: 0.7.{build}
-image: Visual Studio 2017
+image: Visual Studio 2019
 clone_folder: c:\projects\lief
 
 configuration: Release
 
-#clone_depth: 3
-
 platform:
 - x86
 - x64
 
-#cache:
-#  - rang_cpp_color-prefix -> CMakeLists.txt
-#  - mbed_tls -> CMakeLists.txt
-#  - libjson-prefix -> CMakeLists.txt
-#  - easyloggingpp-prefix -> CMakeLists.txt
-#  - tests\YAMLCPP -> tests\CMakeLists.txt
-#  - tests\lief-samples -> tests\CMakeLists.txt
-#  - tests\catch -> tests\CMakeLists.txt
-#  - api\python\pybind11-prefix -> api\python\CMakeLists.txt
-
 environment:
  LIEF_AUTOMATIC_BUILDS_KEY:
     secure: TT7SXISIifq2/tf02n2ATgPj+Ky4Cjl3Fg44BAfyI4yRa4i87UAQIx5EFeV63+Xv2rhcU7JcMgl+An7QBrV6ofuQ9jxbuw+Gd1GqcCrAIyY=
  LIEF_AUTOMATIC_BUILDS_IV:
     secure: /S6Vbt3vEisoC81siFbkqOXQeVnwxLZZPMYp1r79G7h+HFjLlWUZSidxxpsAgHNE
  matrix:
-    # Python 2.7
-    #- PYTHON_VERSION:   "2.7"
-    #  PYTHON32_PATH:    "C:\\Python27"
-    #  PYTHON32_INCLUDE: "C:\\Python27\\include"
-    #  PYTHON32_BINARY:  "C:\\Python27\\python.exe"
-    #  PYTHON32_LIBRARY: "C:\\Python27\\libs\\python27.lib"
-    #  PYTHON64_PATH:    "C:\\Python27-x64"
-    #  PYTHON64_INCLUDE: "C:\\Python27-x64\\include"
-    #  PYTHON64_BINARY:  "C:\\Python27-x64\\python.exe"
-    #  PYTHON64_LIBRARY: "C:\\Python27-x64\\libs\\python27.lib"
-
-
-    # Python 3.5
-    - PYTHON_VERSION:   "3.5"
-      PYTHON32_PATH:    "C:\\Python35"
-      PYTHON32_INCLUDE: "C:\\Python35\\include"
-      PYTHON32_BINARY:  "C:\\Python35\\python.exe"
-      PYTHON32_LIBRARY: "C:\\Python35\\libs\\python35.lib"
-      PYTHON64_PATH:    "C:\\Python35-x64"
-      PYTHON64_INCLUDE: "C:\\Python35-x64\\include"
-      PYTHON64_BINARY:  "C:\\Python35-x64\\python.exe"
-      PYTHON64_LIBRARY: "C:\\Python35-x64\\libs\\python35.lib"
-
-
+    fast_finish: false
     # Python 3.6
     - PYTHON_VERSION:   "3.6"
       PYTHON32_PATH:    "C:\\Python36"
@@ -84,18 +49,16 @@ environment:
       PYTHON64_LIBRARY: "C:\\Python38-x64\\libs\\python38.lib"
 
     # Python 3.9
-    #- PYTHON_VERSION:   "3.9"
-    #  PYTHON32_PATH:    "C:\\Python39"
-    #  PYTHON32_INCLUDE: "C:\\Python39\\include"
-    #  PYTHON32_BINARY:  "C:\\Python39\\python.exe"
-    #  PYTHON32_LIBRARY: "C:\\Python39\\libs\\python39.lib"
-    #  PYTHON64_PATH:    "C:\\Python39-x64"
-    #  PYTHON64_INCLUDE: "C:\\Python39-x64\\include"
-    #  PYTHON64_BINARY:  "C:\\Python39-x64\\python.exe"
-    #  PYTHON64_LIBRARY: "C:\\Python39-x64\\libs\\python39.lib"
+    - PYTHON_VERSION:   "3.9"
+      PYTHON32_PATH:    "C:\\Python39"
+      PYTHON32_INCLUDE: "C:\\Python39\\include"
+      PYTHON32_BINARY:  "C:\\Python39\\python.exe"
+      PYTHON32_LIBRARY: "C:\\Python39\\libs\\python39.lib"
+      PYTHON64_PATH:    "C:\\Python39-x64"
+      PYTHON64_INCLUDE: "C:\\Python39-x64\\include"
+      PYTHON64_BINARY:  "C:\\Python39-x64\\python.exe"
+      PYTHON64_LIBRARY: "C:\\Python39-x64\\libs\\python39.lib"
 
-matrix:
-  fast_finish: true     # set this flag to immediately finish build once one of the jobs fails.
 
 install:
   - ps: if ($env:PLATFORM -eq "x64") { $env:CMAKE_ARCH = "x64" }
@@ -123,6 +86,8 @@ build_script:
   - python.exe .\setup.py --ninja --sdk --lief-test bdist_wheel && exit 0 # Ignore warnings...
 
 after_build:
+  - ps: Get-Service -Name 'ssh-agent' | Set-Service -StartupType Manual
+  - ps: Start-Service -Name 'ssh-agent'
   - bash ./.github/deploy.sh
 
 artifacts:
diff --git a/.github/deploy.sh b/.github/deploy.sh
index 81fc18c..0086425 100644
--- a/.github/deploy.sh
+++ b/.github/deploy.sh
@@ -62,7 +62,6 @@ case $branch in
     devel*) ;;
     master*) ;;
     deploy*) ;;
-    "enhancement/setup") ;;
     *) exit 0;;
 esac
 
@@ -160,11 +159,16 @@ repo=$(git config remote.origin.url)
 ssh_repo=${repo/https:\/\/github.com\//git@github.com:}
 eval $(ssh-agent -s)
 set +x # IMPORTANT
-openssl aes-256-cbc -K $LIEF_AUTOMATIC_BUILDS_KEY -iv $LIEF_AUTOMATIC_BUILDS_IV -in "$LIEF_SRCDIR/.github/deploy-key.enc" -out .git/deploy-key -d
+openssl aes-256-cbc \
+    -K $LIEF_AUTOMATIC_BUILDS_KEY \
+    -iv $LIEF_AUTOMATIC_BUILDS_IV \
+    -in "$LIEF_SRCDIR/.github/deploy-key.enc" \
+    -out .git/deploy-key -d
 set -x
-chmod 600 .git/deploy-key
-ssh-add .git/deploy-key
 fix_home_ssh_perms
+cp .git/deploy-key ~/.ssh/id_rsa
+chmod 400 ~/.ssh/id_rsa
+ssh-add ~/.ssh/id_rsa
 ssh-keyscan -H github.com >> ~/.ssh/known_hosts
 fix_home_ssh_perms
 #