diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 04ed428de..10d639a4a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -65,7 +65,7 @@ jobs:
   - task: CMake@1
     inputs:
       workingDirectory: 'build' # Optional
-      cmakeArgs: '-G "Visual Studio 16 2019" ..'
+      cmakeArgs: '-G "Visual Studio 17 2022" ..'
   - task: CMake@1
     inputs:
       cmakeArgs: '--build . --config Release'
@@ -103,7 +103,7 @@ jobs:
 
 - job: Windows_flang_clang
   pool:
-     vmImage: 'windows-latest'
+     vmImage: 'windows-2022'
   steps:
   - script: |
       set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
@@ -114,7 +114,7 @@ jobs:
       conda install --yes --quiet ninja flang
       mkdir build 
       cd build
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
       cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON ..
       cmake --build . --config Release
       ctest
@@ -178,7 +178,7 @@ jobs:
       cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_Fortran_COMPILER=gfortran-10 -DBUILD_SHARED_LIBS=ON ..
       cmake --build .
       ctest
-      
+
 - job: OSX_Ifort_Clang
   pool:
      vmImage: 'macOS-10.15'