diff --git a/custom-words.txt b/custom-words.txt
index c0419ec13b8f..d3d27f6e35a1 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -78,6 +78,7 @@ apimgroups
 apimidentityprovider
 apimissues
 apimloggers
+apimmsi
 apimnetworkstatus
 apimnotifications
 apimopenidconnectproviders
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
index 48547abde3df..bc4aed719518 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
@@ -897,7 +897,7 @@
         },
         "keyVaultId": {
           "type": "string",
-          "description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with MSI. The secret should be of type *application/x-pkcs12*"
+          "description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with aka.ms/apimmsi. The secret should be of type *application/x-pkcs12*"
         },
         "identityClientId": {
           "type": "string",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
index 5e8dd300c1d9..0e77e54f68cf 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -2747,7 +2747,7 @@
       "properties": {
         "secretIdentifier": {
           "type": "string",
-          "description": "Key vault secret identifier for fetching secret."
+          "description": "Key vault secret identifier for fetching secret. Providing a versioned secret will prevent auto-refresh. This requires Api Management service to be configured with aka.ms/apimmsi"
         },
         "identityClientId": {
           "type": "string",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
index c02c34c81364..a1037ee05972 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
@@ -10,7 +10,7 @@
         "displayName": "prop6namekv",
         "keyVault": {
           "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
-          "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert"
+          "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret"
         },
         "tags": [
           "foo",
@@ -34,7 +34,7 @@
         "properties": {
           "displayName": "prop6namekv",
           "keyVault": {
-            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
             "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
             "lastStatus": {
               "code": "Success",
@@ -57,7 +57,7 @@
         "properties": {
           "displayName": "prop6namekv",
           "keyVault": {
-            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
             "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
             "lastStatus": {
               "code": "Success",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
index eb5c84ef99f0..f596259e1b04 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
@@ -26,7 +26,7 @@
             "properties": {
               "displayName": "prop6namekv",
               "keyVault": {
-                "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+                "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
                 "identityClientId": "2d2df842-44d8-4885-8dec-77cc1a984a31",
                 "lastStatus": {
                   "code": "Success",