diff --git a/doc/common/matrix_generator.md b/doc/common/matrix_generator.md
index 5e33c34f386..59b9d8c210a 100644
--- a/doc/common/matrix_generator.md
+++ b/doc/common/matrix_generator.md
@@ -671,7 +671,7 @@ Given a matrix like below with `JavaTestVersion` marked as a non-sparse paramete
 {
   "matrix": {
     "Agent": {
-      "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" },
+      "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" },
       "ubuntu-2204": { "OSVmImage": "MMSUbuntu22.04", "Pool": "azsdk-pool-mms-ubuntu-2204-general" },
       "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
     },
diff --git a/eng/common-tests/matrix-generator/samples/matrix.json b/eng/common-tests/matrix-generator/samples/matrix.json
index 4104051fb26..c7bf8225d44 100644
--- a/eng/common-tests/matrix-generator/samples/matrix.json
+++ b/eng/common-tests/matrix-generator/samples/matrix.json
@@ -21,7 +21,7 @@
   ],
   "exclude": [
     {
-      "OSVmImage": "MMS2022",
+      "OSVmImage": "windows-2022",
       "framework": "netcoreapp2.1"
     }
   ]
diff --git a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
index 0b46240cc7e..e01694adf03 100644
--- a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
+++ b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
@@ -22,7 +22,7 @@ stages:
           matrix:
             Windows:
               Pool: 'azsdk-pool-mms-win-2022-general'
-              Image: 'MMS2022'
+              Image: 'windows-2022'
             Linux:
               Pool: azsdk-pool-mms-ubuntu-2204-general
               Image: MMSUbuntu22.04
diff --git a/eng/pipelines/agent-pool-migration.yml b/eng/pipelines/agent-pool-migration.yml
index 49a69221322..68efebbfc96 100644
--- a/eng/pipelines/agent-pool-migration.yml
+++ b/eng/pipelines/agent-pool-migration.yml
@@ -78,7 +78,7 @@ parameters:
     - MigrateFrom: windows2019
       MigrateTo: windows2022
     - MigrateFrom: MMS2019
-      MigrateTo: MMS2022
+      MigrateTo: windows-2022
 - name: ShortForMigrateFrom
   type: string
   default: ''
diff --git a/eng/pipelines/apiview-review-gen-swagger.yml b/eng/pipelines/apiview-review-gen-swagger.yml
index 4a79f43f139..0ea9c01bc5d 100644
--- a/eng/pipelines/apiview-review-gen-swagger.yml
+++ b/eng/pipelines/apiview-review-gen-swagger.yml
@@ -4,7 +4,7 @@ trigger: none
 
 pool:
   name: azsdk-pool-mms-win-2022-general
-  vmImage: MMS2022
+  vmImage: windows-2022
 
 variables:
   SwaggerParserInstallPath: $(Pipeline.Workspace)/SwaggerApiParser
diff --git a/eng/pipelines/templates/jobs/azuresdkpartnerdrops-to-nugetfeed.yml b/eng/pipelines/templates/jobs/azuresdkpartnerdrops-to-nugetfeed.yml
index 0735c4f7816..2109ca193f7 100644
--- a/eng/pipelines/templates/jobs/azuresdkpartnerdrops-to-nugetfeed.yml
+++ b/eng/pipelines/templates/jobs/azuresdkpartnerdrops-to-nugetfeed.yml
@@ -39,7 +39,7 @@ jobs:
   - job: AzurePartnerDropsToNuget
     pool:
       name: azsdk-pool-mms-win-2022-general
-      vmImage: MMS2022
+      vmImage: windows-2022
 
     steps:
       - checkout: self
diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
index a7e553833cf..512db6a96b7 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
@@ -123,7 +123,7 @@ stages:
           matrix:
             Windows:
               Pool: azsdk-pool-mms-win-2022-general
-              Image: MMS2022
+              Image: windows-2022
             Linux:
               Pool: azsdk-pool-mms-ubuntu-2204-general
               Image: MMSUbuntu22.04
diff --git a/src/dotnet/APIView/apiview-sync-staging.yml b/src/dotnet/APIView/apiview-sync-staging.yml
index 193ab4713eb..f20e68f8061 100644
--- a/src/dotnet/APIView/apiview-sync-staging.yml
+++ b/src/dotnet/APIView/apiview-sync-staging.yml
@@ -14,7 +14,7 @@ stages:
       - job: 'BlobCopy'
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         steps:
         - pwsh: |
diff --git a/src/dotnet/APIView/apiview.yml b/src/dotnet/APIView/apiview.yml
index b3460509582..9770ee8566b 100644
--- a/src/dotnet/APIView/apiview.yml
+++ b/src/dotnet/APIView/apiview.yml
@@ -52,7 +52,7 @@ stages:
 
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         steps:
           - task: NodeTool@0
@@ -142,7 +142,7 @@ stages:
 
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         steps:
           - template: /eng/common/pipelines/templates/steps/cosmos-emulator.yml
diff --git a/tools/apiview/parsers/cpp-api-parser/ci.yml b/tools/apiview/parsers/cpp-api-parser/ci.yml
index bae391c2eba..d89e61fa2b7 100644
--- a/tools/apiview/parsers/cpp-api-parser/ci.yml
+++ b/tools/apiview/parsers/cpp-api-parser/ci.yml
@@ -32,7 +32,7 @@ stages:
         timeoutInMinutes: 300
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         steps:
           - pwsh: |
@@ -105,7 +105,7 @@ stages:
           environment: github
           pool:
             name: azsdk-pool-mms-win-2022-general
-            vmImage: MMS2022
+            vmImage: windows-2022
           
           strategy: 
             runOnce: