diff --git a/eng/pipelines/daily-verification.yml b/eng/pipelines/daily-verification.yml
index c7a332a679..e33be26811 100644
--- a/eng/pipelines/daily-verification.yml
+++ b/eng/pipelines/daily-verification.yml
@@ -4,7 +4,7 @@ jobs:
     displayName: Daily vcpkg PR
     pool:
       name: azsdk-pool-mms-win-2022-general
-      vmImage: MMS2022
+      vmImage: windows-2022
 
     variables:
       # The branch in the azure-sdk/vcpkg repo that is updated daily with the
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 470f20fcca..5cec0b0f9d 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -69,7 +69,7 @@ jobs:
         displayName: Create API Review for ${{ artifact.name }}
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
         steps:
           - task: Powershell@2
             inputs:
@@ -111,7 +111,7 @@ jobs:
     - job: GenerateReleaseArtifacts
       pool:
         name: azsdk-pool-mms-win-2022-general
-        vmImage: MMS2022
+        vmImage: windows-2022
       variables:
         VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
         Package.EnableSBOMSigning: true
diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml
index 5cf118da3e..d5efca20e0 100644
--- a/eng/pipelines/templates/stages/archetype-cpp-release.yml
+++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml
@@ -22,7 +22,7 @@ stages:
 
             pool:
               name: azsdk-pool-mms-win-2022-general
-              vmImage: MMS2022
+              vmImage: windows-2022
 
             strategy:
               runOnce:
@@ -63,7 +63,7 @@ stages:
 
               pool:
                 name: azsdk-pool-mms-win-2022-general
-                vmImage: MMS2022
+                vmImage: windows-2022
 
               strategy:
                 runOnce:
@@ -93,7 +93,7 @@ stages:
               dependsOn: TagRepository
               pool:
                 name: azsdk-pool-mms-win-2022-general
-                vmImage: MMS2022
+                vmImage: windows-2022
 
               variables:
                 VcpkgPrRepoOwner: Microsoft
@@ -220,7 +220,7 @@ stages:
 
               pool:
                 name: azsdk-pool-mms-win-2022-general
-                vmImage: MMS2022
+                vmImage: windows-2022
 
               strategy:
                 runOnce:
@@ -248,7 +248,7 @@ stages:
 
           pool:
             name: azsdk-pool-mms-win-2022-general
-            vmImage: MMS2022
+            vmImage: windows-2022
 
           steps:
             - checkout: self
diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
index 073dfd6db4..18597e8314 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
@@ -10,7 +10,7 @@
       },
       "Windows": {
         "Pool": "azsdk-pool-mms-win-2022-general",
-        "OSVmImage": "MMS2022",
+        "OSVmImage": "windows-2022",
         "VCPKG_DEFAULT_TRIPLET": "x64-windows"
       },
       "Mac": {
diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
index f7f1b581ef..716b1b4595 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
@@ -3,7 +3,7 @@
     "OSConfig": {
       "Windows": {
         "Pool": "azsdk-pool-mms-win-2022-general",
-        "OSVmImage": "MMS2022",
+        "OSVmImage": "windows-2022",
         "CmakeEnvArg": ""
       },
       "Linux": {
diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json
index e65f4e6bc3..21cd447161 100644
--- a/eng/pipelines/templates/stages/platform-matrix-live.json
+++ b/eng/pipelines/templates/stages/platform-matrix-live.json
@@ -71,12 +71,12 @@
       "StaticConfigs": {
         "Win2019": {
           "Pool": "azsdk-pool-mms-win-2019-general",
-          "OSVmImage": "MMS2019",
+          "OSVmImage": "windows-2019",
           "CMAKE_GENERATOR": "Visual Studio 16 2019"
         },
         "Win2022": {
           "Pool": "azsdk-pool-mms-win-2022-general",
-          "OSVmImage": "MMS2022",
+          "OSVmImage": "windows-2022",
           "CMAKE_GENERATOR": "Visual Studio 17 2022"
         }
       },
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index 59d9b06dfd..aaa88e37f9 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -31,7 +31,7 @@
     {
       "StaticConfigs": { 
         "Win2019_x64_Release": {
-          "OSVmImage": "MMS2019",
+          "OSVmImage": "windows-2019",
           "Pool": "azsdk-pool-mms-win-2019-general",
           "CMAKE_GENERATOR": "Visual Studio 16 2019",
           "CMAKE_GENERATOR_PLATFORM": "x64",
@@ -49,7 +49,7 @@
     {
       "StaticConfigs": {
         "Win2022": {
-          "OSVmImage": "MMS2022",
+          "OSVmImage": "windows-2022",
           "Pool": "azsdk-pool-mms-win-2022-general",
           "CMAKE_GENERATOR": "Visual Studio 17 2022"
         }
@@ -106,7 +106,7 @@
       "StaticConfigs": {
         "Win2022": {
           "VcpkgInstall": "openssl",
-          "OSVmImage": "MMS2022",
+          "OSVmImage": "windows-2022",
           "Pool": "azsdk-pool-mms-win-2022-general",
           "CMAKE_GENERATOR": "Visual Studio 17 2022",
           "PublishMapFiles": "true"
diff --git a/eng/scripts/Get-BinarySizes.ps1 b/eng/scripts/Get-BinarySizes.ps1
index af8a91da48..e436519639 100644
--- a/eng/scripts/Get-BinarySizes.ps1
+++ b/eng/scripts/Get-BinarySizes.ps1
@@ -48,11 +48,11 @@ function getTargetOs {
         return $OsVMImage
     }
 
-    if ($OsVMImage -match "^MMS2019$|^win-2019$") {
+    if ($OsVMImage -eq "windows-2019") {
         return "win-2019"
     }
 
-    if ($OsVMImage -match "^MMS2022$|^win-2022$|^windows-2022$") {
+    if ($OsVMImage -eq "windows-2022") {
         return "win-2022"
     }