diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5be3b8b..b53eadb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,7 +29,7 @@ jobs:
 
   - job: Windows
     pool:
-      vmImage: 'vs2019-win2019'
+      vmImage: 'windows-2019'
     steps:
       - template: ci/test.yml
       - template: ci/build-win.yml
diff --git a/ci/build-macos.yml b/ci/build-macos.yml
index 1661f68..af275e2 100644
--- a/ci/build-macos.yml
+++ b/ci/build-macos.yml
@@ -1,14 +1,16 @@
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '3.7.4'
       addToPath: true
 
   - script: |
+      python --version
       python -m pip install toml click
     displayName: Installing python dependencies
 
   - script: |
+      set -e
       python packager.py build
       cp target/release/espanso-*.gz .
       ls -la
diff --git a/ci/build-win.yml b/ci/build-win.yml
index ba7f6e1..39ea2b5 100644
--- a/ci/build-win.yml
+++ b/ci/build-win.yml
@@ -1,10 +1,11 @@
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '3.7.4'
       addToPath: true
 
   - script: |
+      python --version
       python -m pip install toml click
     displayName: Installing python dependencies
 
@@ -12,4 +13,5 @@ steps:
       python packager.py build
       copy "target\\release\\espanso-win-installer.exe" "espanso-win-installer.exe"
       dir
-    displayName: "Build and packaging for Windows"
\ No newline at end of file
+    displayName: "Build and packaging for Windows"
+