diff --git a/pipelines/azure_pipelines.yml b/pipelines/azure_pipelines.yml
index 6eec1bdb7..9a882d7c8 100644
--- a/pipelines/azure_pipelines.yml
+++ b/pipelines/azure_pipelines.yml
@@ -14,7 +14,7 @@ jobs:
   displayName: Main Build
   timeoutInMinutes: 120
   pool:
-    vmImage: windows-2019
+    vmImage: windows-latest
   steps:
   - checkout: self
   - task: NuGetToolInstaller@1
@@ -31,6 +31,11 @@ jobs:
     inputs:
       version: 5.x
       includePreviewVersions: true
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 6.x'
+    inputs:
+      version: 6.x
+      includePreviewVersions: true
   - task: DotNetCoreCLI@2
     displayName: Build Microsoft.AspNetCore.OData
     inputs:
diff --git a/pipelines/azure_pipelines_nightly.yml b/pipelines/azure_pipelines_nightly.yml
index 393a837b3..9926f10d4 100644
--- a/pipelines/azure_pipelines_nightly.yml
+++ b/pipelines/azure_pipelines_nightly.yml
@@ -23,7 +23,7 @@ stages:
     displayName: Main Build
     timeoutInMinutes: 120
     pool:
-      vmImage: windows-2019
+      vmImage: windows-latest
     steps:
     - checkout: self
     - task: NuGetToolInstaller@1
@@ -40,6 +40,11 @@ stages:
       inputs:
         version: 5.x
         includePreviewVersions: true
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core SDK 6.x'
+      inputs:
+        version: 6.x
+        includePreviewVersions: true
     - task: DotNetCoreCLI@2
       displayName: Build Microsoft.AspNetCore.OData
       inputs: