diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 4ef04aa9b3f414..7061cfb8c2cd3c 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  windows-pool: 'PrWin-2022-03-09-1'
-  linux-pool: 'PrLin-2022-03-09-1'
+  windows-pool: 'PrWin-2022-04-13'
+  linux-pool: 'PrLin-2022-04-13'
   osx-pool: 'PrOsx-2022-02-04'
 
 jobs:
diff --git a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1
index a0b32cebb7ee72..5b58b7eb4676fa 100644
--- a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1
+++ b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1
@@ -7,7 +7,7 @@
 
 # Seems like only the HPC kit is really needed?
 #$oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe'
-$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe'
+$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe'
 
 # Possible oneAPI Base components:
 #intel.oneapi.win.vtune           2021.1.1-68           true      Intel® VTune(TM) Profiler
diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
index 332d68f92162d9..4707808edadf8c 100644
--- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1
+++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
@@ -5,5 +5,5 @@
 
 # REPLACE WITH UTILITY-PREFIX.ps1
 
-$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi'
+$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi'
 InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
index 2567d4c11d6ed3..96021bd1dd6f64 100644
--- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
+++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@@ -14,14 +14,18 @@ $Workloads = @(
   'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
   'Microsoft.VisualStudio.Component.VC.ATL',
   'Microsoft.VisualStudio.Component.VC.ATLMFC',
-  'Microsoft.VisualStudio.Component.Windows10SDK.18362',
-  'Microsoft.VisualStudio.Component.Windows10SDK.19041',
+  'Microsoft.VisualStudio.Component.VC.ATL.ARM',
+  'Microsoft.VisualStudio.Component.VC.ATL.ARM64',
+  'Microsoft.VisualStudio.Component.VC.MFC.ARM',
+  'Microsoft.VisualStudio.Component.VC.MFC.ARM64',
+  'Microsoft.VisualStudio.Component.Windows10SDK',
   'Microsoft.Net.Component.4.8.SDK',
   'Microsoft.Net.Component.4.7.2.TargetingPack',
   'Microsoft.Component.NetFX.Native',
   'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset',
   'Microsoft.VisualStudio.Component.VC.Llvm.Clang',
-  'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools'
+  'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools',
+  'Microsoft.VisualStudio.Component.VC.CMake.Project'
 )
 
 <#
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d9d0e40b38a866..98da01436c6fe8 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -47,8 +47,6 @@
 # other ports
 # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
 apr:arm64-windows=fail
-# Requires ATL for ARM64 to be installed in CI
-azure-storage-cpp:arm64-windows=fail
 
 aubio:arm-uwp=fail
 aubio:x64-uwp=fail
@@ -1425,4 +1423,4 @@ dimcli:x64-windows-static=fail
 # ZeroC doesn't provide ARM tagets in project files.
 zeroc-ice:arm64-windows=fail
 zeroc-ice:arm-uwp=fail
-zeroc-ice:x64-uwp=fail
\ No newline at end of file
+zeroc-ice:x64-uwp=fail