diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82703f5e515799bdd40a69dcaf4660e90a1b9091..3356098886cbcbaee6bb967182d5c8bb2c43f1f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,11 @@
 # ---- OGS-6 Project ----
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.14)
 
 # Set CMake policies
-cmake_policy(SET CMP0054 NEW)
-cmake_policy(SET CMP0071 NEW)
-cmake_policy(SET CMP0074 NEW)
-if(${CMAKE_VERSION} VERSION_GREATER 3.14)
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.15)
     cmake_policy(SET CMP0092 NEW)
 endif()
 
-if(MSVC AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja)
-    # Force 64-bit VS compiler
-    set(CMAKE_GENERATOR_TOOLSET host=x64)
-endif()
-
 project(OGS-6)
 
 include(scripts/cmake/CMakeSetup.cmake)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cc374d08f7b962939c48df06def08bbc96894818..53ef2bd5df2cde78f35c6cddc816ebc4b17bca3f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 jobs:
 - job: Windows
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   timeoutInMinutes: 120
   variables:
     NUM_THREADS: 2
@@ -19,7 +19,7 @@ jobs:
       call activate.bat
       mkdir build
       cd build
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\vsdevcmd" -arch=x64
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd" -arch=x64
       cmake .. -G Ninja -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON -DOGS_USE_PCH=OFF
       ninja -j 2
       ninja -j 2 tests
diff --git a/web/data/versions.json b/web/data/versions.json
index 7ccf5fa60e0c661de7c490a72934ed29c9d5e574..5e54452044a499fe6af9015c6642587a4a064ca0 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -3,13 +3,13 @@
     "gcc": "8.0",
     "clang": "3.5",
     "msvc": {
-      "year": "2017",
-      "number": "15",
-      "toolset": "141"
+      "year": "2019",
+      "number": "16",
+      "toolset": "142"
     },
     "conan": "1.21.0",
     "git": "2.14",
-    "cmake": "3.12",
+    "cmake": "3.14",
     "hugo": "0.64.1",
     "boost": "1.66.0",
     "eigen": "3.3.4",