diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 08a594dd..d7451ba0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - powershell: |
           cd builds\msvc\build
-          & .\buildbase.bat ..\vs2026\libsodium.sln 18
+          & .\buildbase.bat ..\vs2022\libsodium.sln 17
         displayName: Compile it all
       - powershell: |
           mkdir bin\include\sodium
@@ -19,7 +19,6 @@ jobs:
           Copy-Item "src\libsodium\include\*.h" -Destination "bin\include\"
         displayName: Copy header files
       - task: PublishBuildArtifacts@1
-        condition: not(canceled())
         inputs:
           pathToPublish: bin
           artifactName: libsodium
@@ -38,7 +37,6 @@ jobs:
           Copy-Item "src\libsodium\include\*.h" -Destination "bin\include\"
         displayName: Copy header files
       - task: PublishBuildArtifacts@1
-        condition: not(canceled())
         inputs:
           pathToPublish: bin
           artifactName: libsodium
@@ -48,7 +46,7 @@ jobs:
       vmImage: "windows-2022"
     steps:
       - powershell: |
-          choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --quiet --wait" -y
+          choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --quiet --wait" -y
         displayName: Install VS2019 Build Tools
       - powershell: |
           cd builds\msvc\build
@@ -60,7 +58,6 @@ jobs:
           Copy-Item "src\libsodium\include\*.h" -Destination "bin\include\"
         displayName: Copy header files
       - task: PublishBuildArtifacts@1
-        condition: not(canceled())
         inputs:
           pathToPublish: bin
           artifactName: libsodium