diff --git a/.azure/OneBranch.Tests.Official.yml b/.azure/OneBranch.Tests.Official.yml
index f275256774..7d54d3fe9c 100644
--- a/.azure/OneBranch.Tests.Official.yml
+++ b/.azure/OneBranch.Tests.Official.yml
@@ -29,7 +29,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -45,7 +45,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -63,7 +63,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -81,7 +81,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
diff --git a/.azure/OneBranch.Tests.PullRequest.yml b/.azure/OneBranch.Tests.PullRequest.yml
index 598396424d..66a0aff87c 100644
--- a/.azure/OneBranch.Tests.PullRequest.yml
+++ b/.azure/OneBranch.Tests.PullRequest.yml
@@ -29,7 +29,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -45,7 +45,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -63,7 +63,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -81,7 +81,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index 132061549f..19513bfc35 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -50,7 +50,7 @@ jobs:
     runs-on:
      - self-hosted
      - "1ES.Pool=1es-msquic-pool"
-     - "1ES.ImageOverride=WinServerPrerelease"
+     - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       with:
@@ -93,7 +93,7 @@ jobs:
     runs-on:
     - self-hosted
     - "1ES.Pool=1es-msquic-pool"
-    - "1ES.ImageOverride=WinServerPrerelease"
+    - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     env:
       main-timeout: 3600000
       main-repeat: 100
@@ -143,7 +143,7 @@ jobs:
     runs-on:
     - self-hosted
     - "1ES.Pool=1es-msquic-pool"
-    - "1ES.ImageOverride=WinServerPrerelease"
+    - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     env:
       main-timeout: 3600000
       pr-timeout: 600000
diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml
index 4df63a18a5..265d502b10 100644
--- a/.github/workflows/stress.yml
+++ b/.github/workflows/stress.yml
@@ -89,7 +89,7 @@ jobs:
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", build: "-Test" },
           { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     env:
       main-timeout: 3600000
       main-repeat: 100
@@ -149,7 +149,7 @@ jobs:
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", build: "-Test" },
           { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     env:
       main-timeout: 3600000
       pr-timeout: 600000
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1aa3e7ddc8..d6b5d091e1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -116,7 +116,7 @@ jobs:
           { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
           { config: "Release", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -176,7 +176,7 @@ jobs:
           { config: "Debug", plat: "winkernel", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
           { config: "Release", plat: "winkernel", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'winkernel' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'winkernel' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -223,7 +223,7 @@ jobs:
     runs-on:
     - self-hosted
     - "1ES.Pool=1es-msquic-pool"
-    - "1ES.ImageOverride=WinServerPrerelease"
+    - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     steps:
     - name: Checkout repository
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332