diff --git a/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json b/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json
index 195ab3349582..af84acf4c7d1 100644
--- a/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json
+++ b/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json
@@ -19,15 +19,15 @@
                 "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "FALSE"
             },
 
-            "Windows2019_NET6.0": {
-                "OSVmImage": "MMS2019",
-                "Pool": "azsdk-pool-mms-win-2019-general",
+            "windows2022_NET6.0": {
+                "OSVmImage": "MMS2022",
+                "Pool": "azsdk-pool-mms-win-2022-general",
                 "TestTargetFramework": "net6.0",
                 "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "TRUE"
             },
-            "Windows2019_NET461": {
-                "OSVmImage": "MMS2019",
-                "Pool": "azsdk-pool-mms-win-2019-general",
+            "windows2022_NET461": {
+                "OSVmImage": "MMS2022",
+                "Pool": "azsdk-pool-mms-win-2022-general",
                 "TestTargetFramework": "net461",
                 "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "TRUE"
             },
@@ -55,9 +55,9 @@
     "include": [
         {
             "Agent": {
-                "Windows2019": {
-                    "OSVmImage": "MMS2019",
-                    "Pool": "azsdk-pool-mms-win-2019-general",
+                "windows2022": {
+                    "OSVmImage": "MMS2022",
+                    "Pool": "azsdk-pool-mms-win-2022-general",
                     "TestTargetFramework": "net6.0"
                 }
             },
diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
index 8882722d25e5..4c7403e26013 100644
--- a/sdk/storage/platform-matrix-all-versions.json
+++ b/sdk/storage/platform-matrix-all-versions.json
@@ -5,8 +5,8 @@
           "OSVmImage": "MMSUbuntu20.04",
           "Pool": "azsdk-pool-mms-ubuntu-2004-storage"
       },
-      "windows-2019": {
-          "OSVmImage": "MMS2019",
+      "windows-2022": {
+          "OSVmImage": "MMS2022",
           "Pool": "azsdk-pool-mms-win-2019-storage"
       }
     },