diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d7451ba0..005d91fa 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -46,7 +46,7 @@ jobs:
       vmImage: "windows-2022"
     steps:
       - powershell: |
-          choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --quiet --wait" -y
+          choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --quiet --wait" -y
         displayName: Install VS2019 Build Tools
       - powershell: |
           cd builds\msvc\build
diff --git a/builds/msvc/build/buildbase.bat b/builds/msvc/build/buildbase.bat
index 19f445bd..91119829 100644
--- a/builds/msvc/build/buildbase.bat
+++ b/builds/msvc/build/buildbase.bat
@@ -12,7 +12,7 @@ IF NOT EXIST !vswhere! SET vswhere="%ProgramFiles%\Microsoft Visual Studio\Insta
 SET /A next_version=version + 1
 SET version_range=[%version%.0,!next_version!.0)
 SET required_components=Microsoft.VisualStudio.Component.VC.Tools.x86.x64
-IF %version% GEQ 16 SET required_components=!required_components! Microsoft.VisualStudio.Component.VC.Tools.ARM64
+IF %version% GEQ 17 SET required_components=!required_components! Microsoft.VisualStudio.Component.VC.Tools.ARM64
 
 IF %version% GEQ 15 (
   IF EXIST !vswhere! (
@@ -79,8 +79,8 @@ ECHO Configuration=StaticRelease
 msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log%
 IF errorlevel 1 GOTO error
 
-@REM Build ARM64 packages only for Visual studio 2019 and later
-IF %version% GEQ 16 (
+@REM Build ARM64 packages only for Visual Studio 2022 and later
+IF %version% GEQ 17 (
   ENDLOCAL & SET solution=%solution% & SET version=%version% & SET log=%log% & SET environment=%environment%
   SETLOCAL enabledelayedexpansion