diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 12e0354af7..d1db6ebf5b 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  windows-pool: 'PrWin-2022-07-14'
+  windows-pool: 'PrWin-2022-08-10'
   linux-pool: 'PrLin-2022-07-14'
   osx-pool: 'PrOsx-2022-02-04'
 
diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1
index cbbb9b5af8..54ed2142bb 100755
--- a/scripts/azure-pipelines/linux/create-vmss.ps1
+++ b/scripts/azure-pipelines/linux/create-vmss.ps1
@@ -98,6 +98,10 @@ $Vmss = Set-AzVmssStorageProfile `
   -DiffDiskSetting Local `
   -ImageReferenceId $Image.Id
 
+$Vmss = Set-AzVmssBootDiagnostic `
+  -VirtualMachineScaleSet $Vmss `
+  -Enabled $true
+
 New-AzVmss `
   -ResourceGroupName $ResourceGroupName `
   -Name $VmssName `
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
index 8c78f485f8..ce25aa10d7 100755
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@@ -66,14 +66,14 @@ APT_PACKAGES="$APT_PACKAGES libdbus-1-dev"
 # Additionally required by at-spi2-atk
 APT_PACKAGES="$APT_PACKAGES libxtst-dev"
 
+# Additionally required by bond
+APT_PACKAGES="$APT_PACKAGES haskell-stack"
+
 # Additionally required/installed by Azure DevOps Scale Set Agents
 APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70"
 
 apt-get -y install $APT_PACKAGES
 
-# Install the latest Haskell stack for bond
-curl -sSL https://get.haskellstack.org/ | sh
-
 # Start up cudnn
 update-nvidia-cudnn -d
 update-nvidia-cudnn -u
@@ -89,6 +89,7 @@ apt-get install --no-install-recommends libnccl2 libnccl-dev
 # Install PowerShell
 wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
 dpkg -i packages-microsoft-prod.deb
+rm -f packages-microsoft-prod.deb
 apt-get update
 add-apt-repository universe
 apt-get install -y powershell
diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1
index bf3586c84a..ea2a00a7f0 100644
--- a/scripts/azure-pipelines/windows/create-vmss.ps1
+++ b/scripts/azure-pipelines/windows/create-vmss.ps1
@@ -84,6 +84,10 @@ $Vmss = Set-AzVmssStorageProfile `
   -DiffDiskSetting Local `
   -ImageReferenceId $Image.Id
 
+$Vmss = Set-AzVmssBootDiagnostic `
+  -VirtualMachineScaleSet $Vmss `
+  -Enabled $true
+
 New-AzVmss `
   -ResourceGroupName $ResourceGroupName `
   -Name $VmssName `
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 92a5ac1c7a..d8db40c7c8 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -272,6 +272,8 @@ ftgl:arm-uwp=fail
 # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207
 functions-framework-cpp:x64-uwp=fail
 
+# VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474
+gazebo:x64-windows=fail
 gazebo:x64-linux=fail
 # gsoap does not offer stable public source downloads
 gsoap:x64-windows        = skip
@@ -323,6 +325,11 @@ gperftools:x64-uwp=fail
 gperftools:arm-uwp=fail
 graphicsmagick:arm-uwp=fail
 graphicsmagick:x64-uwp=fail
+# graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251
+graphicsmagick:x86-windows=fail
+graphicsmagick:x64-windows=fail
+graphicsmagick:x64-windows-static=fail
+graphicsmagick:x64-windows-static-md=fail
 gstreamer:x64-osx=fail
 gstreamer:arm64-osx=fail
 gtk:x64-windows-static=fail
@@ -881,6 +888,8 @@ qt5-canvas3d:x86-windows=skip
 qt5-wayland:x64-osx=fail
 qtwayland:x64-osx=fail
 qtwayland:arm64-osx=fail
+# Post build checks fail
+qtwebengine:arm64-windows=fail
 # Missing prerequisites for CI success
 qt5-webengine:x64-linux=fail
 qt5-webengine:x64-osx=fail
@@ -890,8 +899,6 @@ qt5-webengine:x64-osx=fail
 # Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg.
 qt5-webengine:x64-windows=skip
 qt5-webengine:x86-windows=skip
-# VS2022 17.2 ICE https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296
-qtwebengine:x64-windows=fail
 # Missing system libraries
 qt5-x11extras:x64-osx=fail
 qt5-x11extras:arm64-osx=fail
@@ -980,10 +987,6 @@ rsasynccpp:x64-osx=fail
 rsm-binary-io:x64-linux=fail
 # Requires g++10 but CI compiler only has g++9
 rsm-bsa:x64-linux=fail
-# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389
-rsocket:x64-windows=fail
-rsocket:x64-windows-static=fail
-rsocket:x64-windows-static-md=fail
 rtlsdr:x64-uwp=fail
 rtlsdr:arm64-windows=fail
 rtlsdr:arm-uwp=fail
@@ -1249,16 +1252,6 @@ zeroc-ice:arm64-windows=fail
 zeroc-ice:arm-uwp=fail
 zeroc-ice:x64-uwp=fail
 
-# ANGLE triggers an intermittent ice in C1XX
-# https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1472813
-angle:x86-windows=fail
-angle:x64-windows=fail
-angle:x64-windows-static=fail
-angle:x64-windows-static-md=fail
-angle:x64-uwp=fail
-angle:arm64-windows=fail
-angle:arm-uwp=fail
-
 cmake-user:arm-uwp=pass
 cmake-user:arm64-windows=pass
 cmake-user:x64-linux=pass