diff --git a/.appveyor.yml b/.appveyor.yml
index 5c338528..b338fbf4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
 version : 2.x.{build}
-image: Visual Studio 2019
+
 clone_folder: C:\Project
 
 environment:
@@ -12,22 +12,20 @@ environment:
         # For Python versions available on Appveyor, see
         # https://www.appveyor.com/docs/windows-images-software/#python
         # NOMERGE: re-enable before merging
-      # - {PY_VER: "27", PY_ARCH: "32"}
-      # - {PY_VER: "27", PY_ARCH: "64"}
-      - {PY_VER: "39", PY_ARCH: "32"}
-      - {PY_VER: "39", PY_ARCH: "64"}
-      # - {PY_VER: "38", PY_ARCH: "32"}
-      # - {PY_VER: "38", PY_ARCH: "64"}
-      # - {PY_VER: "37", PY_ARCH: "32"}
-      # - {PY_VER: "37", PY_ARCH: "64"}
-      # - {PY_VER: "36", PY_ARCH: "32"}
-      # - {PY_VER: "36", PY_ARCH: "64"}
-      # - {PY_VER: "35", PY_ARCH: "32"}
-      # - {PY_VER: "35", PY_ARCH: "64"}
-      # - {PY_VER: "34", PY_ARCH: "32"}
-      # - {PY_VER: "34", PY_ARCH: "64"}
+        - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "32"}
+        - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "64"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "32"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "64"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "37", PY_ARCH: "32"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "37", PY_ARCH: "64"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "32"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "64"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "35", PY_ARCH: "32"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "35", PY_ARCH: "64"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "34", PY_ARCH: "32"}
+        # - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "34", PY_ARCH: "64"}
 
-    OPENSSL_VERSION: "1_1_1g"
+    OPENSSL_VERSION: "1_1_1h"
     POSTGRES_VERSION: "11_4"
 
     PSYCOPG2_TESTDB: psycopg2_test
@@ -38,6 +36,9 @@ environment:
     PGPASSWORD: Password12!
     PGSSLMODE: require
 
+    # Add CWD to perl library path for PostgreSQL build on VS2019
+    PERL5LIB: .
+
     # Select according to the service enabled
     POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\
 
diff --git a/scripts/appveyor.cache_rebuild b/scripts/appveyor.cache_rebuild
index 6b6f781a..432d68ee 100644
--- a/scripts/appveyor.cache_rebuild
+++ b/scripts/appveyor.cache_rebuild
@@ -9,10 +9,10 @@ To invalidate the cache, update this file and check it into git.
 Currently used modules built in the cache:
 
 OpenSSL
-        Version: 1.1.1d
+        Version: 1.1.1h
 
 PostgreSQL
-        Version: 11.5
+        Version: 11.4
 
 
 NOTE: to zap the cache manually you can also use: