diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimidentityprovider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimidentityprovider.json
index 1818df1aaf2d..e8b8934300eb 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimidentityprovider.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimidentityprovider.json
@@ -204,7 +204,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/IdentityProviderContract"
+              "$ref": "./definitions.json#/definitions/IdentityProviderCreateContract"
             },
             "description": "Create parameters."
           },
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimnamedvalues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimnamedvalues.json
index 0bcc3cc88787..c8919167aee0 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimnamedvalues.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimnamedvalues.json
@@ -218,7 +218,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/NamedValueContract"
+              "$ref": "./definitions.json#/definitions/NamedValueCreateContract"
             },
             "description": "Create parameters."
           },
@@ -389,6 +389,51 @@
           }
         }
       }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/namedValues/{namedValueId}/listValue": {
+      "post": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_ListValue",
+        "description": "Gets the secret value of the NamedValue.",
+        "x-ms-examples": {
+          "ApiManagementListSecretsSubscription": {
+            "$ref": "./examples/ApiManagementListSecretsNamedValue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains secret value.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PropertyValueContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {},
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimopenidconnectproviders.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimopenidconnectproviders.json
index 1d34efe1d3d1..883fe00fa510 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimopenidconnectproviders.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimopenidconnectproviders.json
@@ -215,7 +215,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/OpenidConnectProviderContract"
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderCreateContract"
             },
             "description": "Create parameters."
           },
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimportalsettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimportalsettings.json
index 195a604e3fbf..f0a3d19cde17 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimportalsettings.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/apimportalsettings.json
@@ -609,6 +609,48 @@
           }
         }
       }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation/listSecrets": {
+      "post": {
+        "tags": [
+          "DelegationSettings"
+        ],
+        "operationId": "DelegationSettings_ListSecrets",
+        "description": "Gets the secret validation key of the DelegationSettings.",
+        "x-ms-examples": {
+          "ApiManagementListSecretsPortalSettings": {
+            "$ref": "./examples/ApiManagementListSecretsPortalSettingsValidationKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the validation key.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSettingValidationKeyContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/definitions.json
index 6689c928a966..058d474ffcec 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/definitions.json
@@ -993,10 +993,6 @@
             "url": "http://tools.ietf.org/html/rfc6749#section-4"
           }
         },
-        "clientSecret": {
-          "type": "string",
-          "description": "Client or app secret registered with this authorization server. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
-        },
         "resourceOwnerUsername": {
           "type": "string",
           "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner username."
@@ -1065,6 +1061,11 @@
         "clientId": {
           "type": "string",
           "description": "Client or app id registered with this authorization server."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client or app secret registered with this authorization server. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
         }
       },
       "allOf": [
@@ -1153,6 +1154,11 @@
         "clientId": {
           "type": "string",
           "description": "Client or app id registered with this authorization server."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client or app secret registered with this authorization server. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
         }
       },
       "allOf": [
@@ -2252,6 +2258,46 @@
       },
       "description": "Identity Provider Base Parameter Properties."
     },
+    "IdentityProviderCreateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IdentityProviderCreateContractProperties",
+          "description": "Identity Provider contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./apimanagement.json#/definitions/Resource"
+        }
+      ],
+      "description": "Identity Provider details."
+    },
+    "IdentityProviderCreateContractProperties": {
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "Client Id of the Application in the external Identity Provider. It is App ID for Facebook login, Client ID for Google login, App ID for Microsoft.",
+          "minLength": 1
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client secret of the Application in external Identity Provider, used to authenticate login request. For example, it is App Secret for Facebook login, API Key for Google login, Public Key for Microsoft. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "minLength": 1
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/IdentityProviderBaseParameters"
+        }
+      ],
+      "required": [
+        "clientId",
+        "clientSecret"
+      ],
+      "description": "The external Identity Providers like Facebook, Google, Microsoft, Twitter or Azure Active Directory which can be used to enable access to the API Management service developer portal for all users."
+    },
     "IdentityProviderContract": {
       "properties": {
         "properties": {
@@ -2275,6 +2321,7 @@
           "minLength": 1
         },
         "clientSecret": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "Client secret of the Application in external Identity Provider, used to authenticate login request. For example, it is App Secret for Facebook login, API Key for Google login, Public Key for Microsoft. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
           "minLength": 1
@@ -2324,6 +2371,7 @@
           "minLength": 1
         },
         "clientSecret": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "Client secret of the Application in external Identity Provider, used to authenticate login request. For example, it is App Secret for Facebook login, API Key for Google login, Public Key for Microsoft.",
           "minLength": 1
@@ -2830,6 +2878,54 @@
       },
       "description": "Paged OpenIdProviders list representation."
     },
+    "OpenidConnectProviderCreateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OpenidConnectProviderCreateContractProperties",
+          "description": "OpenId Connect Provider contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./apimanagement.json#/definitions/Resource"
+        }
+      ],
+      "description": "OpenId Connect Provider details."
+    },
+    "OpenidConnectProviderCreateContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "User-friendly OpenID Connect Provider name.",
+          "maxLength": 50
+        },
+        "description": {
+          "type": "string",
+          "description": "User-friendly description of OpenID Connect Provider."
+        },
+        "metadataEndpoint": {
+          "type": "string",
+          "description": "Metadata endpoint URI."
+        },
+        "clientId": {
+          "type": "string",
+          "description": "Client ID of developer console which is the client application."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client Secret of developer console which is the client application."
+        }
+      },
+      "required": [
+        "displayName",
+        "metadataEndpoint",
+        "clientId",
+        "clientSecret"
+      ],
+      "description": "OpenID Connect Providers Contract."
+    },
     "OpenidConnectProviderContract": {
       "properties": {
         "properties": {
@@ -2865,6 +2961,7 @@
           "description": "Client ID of developer console which is the client application."
         },
         "clientSecret": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "Client Secret of developer console which is the client application."
         }
@@ -2906,6 +3003,7 @@
           "description": "Client ID of developer console which is the client application."
         },
         "clientSecret": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "Client Secret of developer console which is the client application."
         }
@@ -3360,6 +3458,7 @@
           "description": "A delegation Url."
         },
         "validationKey": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "A base64-encoded validation key to validate, that a request is coming from Azure API Management."
         },
@@ -3582,6 +3681,48 @@
       },
       "description": "Paged NamedValue list representation."
     },
+    "NamedValueCreateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NamedValueCreateContractProperties",
+          "description": "NamedValue entity contract properties for PUT operation."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./apimanagement.json#/definitions/Resource"
+        }
+      ],
+      "description": "NamedValue details."
+    },
+    "NamedValueCreateContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Unique name of NamedValue. It may contain only letters, digits, period, dash, and underscore characters.",
+          "minLength": 1,
+          "maxLength": 256,
+          "pattern": "^[A-Za-z0-9-._]+$"
+        },
+        "value": {
+          "type": "string",
+          "description": "Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "minLength": 1,
+          "maxLength": 4096
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/NamedValueEntityBaseParameters"
+        }
+      ],
+      "required": [
+        "displayName",
+        "value"
+      ],
+      "description": "NamedValue Contract properties."
+    },
     "NamedValueContract": {
       "properties": {
         "properties": {
@@ -3608,7 +3749,7 @@
         },
         "value": {
           "type": "string",
-          "description": "Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace.",
+          "description": "Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
           "minLength": 1,
           "maxLength": 4096
         }
@@ -3619,8 +3760,7 @@
         }
       ],
       "required": [
-        "displayName",
-        "value"
+        "displayName"
       ],
       "description": "NamedValue Contract properties."
     },
@@ -4412,12 +4552,14 @@
           "description": "Upcoming subscription expiration notification date. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
         },
         "primaryKey": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "Subscription primary key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
           "minLength": 1,
           "maxLength": 256
         },
         "secondaryKey": {
+          "x-ms-secret": true,
           "type": "string",
           "description": "Subscription secondary key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
           "minLength": 1,
@@ -5189,6 +5331,24 @@
       },
       "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
     },
+    "PropertyValueContract": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "This is secret value of the NamedValue entity."
+        }
+      },
+      "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
+    },
+    "PortalSettingValidationKeyContract": {
+      "properties": {
+        "validationKey": {
+          "type": "string",
+          "description": "This is secret value of the validation key in portal settings."
+        }
+      },
+      "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
+    },
     "SubscriptionKeysContract": {
       "properties": {
         "primaryKey": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateAuthorizationServer.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateAuthorizationServer.json
index a388d444f62a..1b77b3fbc21a 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateAuthorizationServer.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateAuthorizationServer.json
@@ -56,7 +56,6 @@
             "authorizationHeader"
           ],
           "clientId": "1",
-          "clientSecret": "2",
           "resourceOwnerUsername": "un",
           "resourceOwnerPassword": "pwd"
         }
@@ -86,7 +85,6 @@
             "authorizationHeader"
           ],
           "clientId": "1",
-          "clientSecret": "2",
           "resourceOwnerUsername": "un",
           "resourceOwnerPassword": "pwd"
         }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateIdentityProvider.json
index d1dca962b930..086635f4456d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateIdentityProvider.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateIdentityProvider.json
@@ -20,7 +20,6 @@
         "name": "Facebook",
         "properties": {
           "clientId": "facebookid",
-          "clientSecret": "facebookapplicationsecret",
           "type": "facebook"
         }
       }
@@ -32,7 +31,6 @@
         "name": "Facebook",
         "properties": {
           "clientId": "facebookid",
-          "clientSecret": "facebookapplicationsecret",
           "type": "facebook"
         }
       }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateNamedValue.json
index 6403d2a0aba3..9bbb3ce929d1 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateNamedValue.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateNamedValue.json
@@ -13,7 +13,7 @@
           "foo",
           "bar"
         ],
-        "secret": true
+        "secret": false
       }
     }
   },
@@ -35,7 +35,7 @@
             "foo",
             "bar"
           ],
-          "secret": true
+          "secret": false
         }
       }
     },
@@ -51,7 +51,7 @@
             "foo",
             "bar"
           ],
-          "secret": true
+          "secret": false
         }
       }
     }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json
index d6735e4a6c95..a56bd85f12f4 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json
@@ -9,7 +9,8 @@
       "properties": {
         "displayName": "templateoidprovider3",
         "metadataEndpoint": "https://oidprovider-template3.net",
-        "clientId": "oidprovidertemplate3"
+        "clientId": "oidprovidertemplate3",
+        "clientSecret": "x"
       }
     }
   },
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateSubscription.json
index 20f68fefa8b3..d2745708ae03 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateSubscription.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementCreateSubscription.json
@@ -24,9 +24,7 @@
           "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
           "displayName": "testsub",
           "state": "submitted",
-          "createdDate": "2017-06-02T23:34:03.1055076Z",
-          "primaryKey": "06c34e1a9d394412b292e0611e73d417",
-          "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+          "createdDate": "2017-06-02T23:34:03.1055076Z"
         }
       }
     },
@@ -40,9 +38,7 @@
           "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
           "displayName": "testsub",
           "state": "submitted",
-          "createdDate": "2017-06-02T23:34:03.1055076Z",
-          "primaryKey": "06c34e1a9d394412b292e0611e73d417",
-          "secondaryKey": "1e756a7705364c529e8d1760190f47b3"
+          "createdDate": "2017-06-02T23:34:03.1055076Z"
         }
       }
     }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListNamedValues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListNamedValues.json
index 19001e0eaa8f..5703f3a5b00d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListNamedValues.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListNamedValues.json
@@ -15,8 +15,8 @@
             "name": "592f1174cc83890dc4f32686",
             "properties": {
               "displayName": "Logger-Credentials-592f1174cc83890dc4f32687",
-              "value": "Endpoint=sb://testtemplatetesteh.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=...",
-              "secret": true
+              "value": "propValue",
+              "secret": false
             }
           },
           {
@@ -25,12 +25,11 @@
             "name": "testarmTemplateproperties2",
             "properties": {
               "displayName": "propName",
-              "value": "propValue",
               "tags": [
                 "foo",
                 "bar"
               ],
-              "secret": false
+              "secret": true
             }
           }
         ],
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsNamedValue.json
new file mode 100644
index 000000000000..b89eab4486d6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsNamedValue.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-12-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testarmTemplateproperties2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": "propValue"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
new file mode 100644
index 000000000000..425030ae6837
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-12-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q=="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
index a164cedca20d..0bbf85b5dde9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
@@ -13,7 +13,6 @@
         "name": "delegation",
         "properties": {
           "url": "http://contoso.com/delegation",
-          "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
           "subscriptions": {
             "enabled": true
           },
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
index 48297a20c1c9..60d4fd41b926 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -27,7 +27,6 @@
         "name": "delegation",
         "properties": {
           "url": "http://contoso.com/delegation",
-          "validationKey": "nVF7aKIvr9mV/RM5lOD0sYoi8ThXTRHQP7o66hvUmjCDkPKR3qxPu/otJcNciz2aQdqPuzJH3ECG4TU2yZjQ7Q==",
           "subscriptions": {
             "enabled": true
           },
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementUpdateNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementUpdateNamedValue.json
index e199a4604280..c6ae610b7698 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementUpdateNamedValue.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2019-12-01-preview/examples/ApiManagementUpdateNamedValue.json
@@ -8,11 +8,13 @@
     "If-Match": "*",
     "parameters": {
       "properties": {
+        "displayName": "prop3name",
+        "value": "propValue",
         "tags": [
           "foo",
           "bar2"
         ],
-        "secret": true
+        "secret": false
       }
     }
   },
@@ -26,15 +28,14 @@
       "body": {
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2",
         "type": "Microsoft.ApiManagement/service/namedValues",
-        "name": "testprop2",
         "properties": {
           "displayName": "prop3name",
           "value": "propValue",
           "tags": [
             "foo",
-            "bar"
+            "bar2"
           ],
-          "secret": true
+          "secret": false
         }
       }
     },