diff --git a/schemas/2021-03-01/Microsoft.BotService.json b/schemas/2021-03-01/Microsoft.BotService.json
index d0e42847df..7a401f04ef 100644
--- a/schemas/2021-03-01/Microsoft.BotService.json
+++ b/schemas/2021-03-01/Microsoft.BotService.json
@@ -388,29 +388,10 @@
     "BotProperties": {
       "type": "object",
       "properties": {
-        "allSettings": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Contains resource all settings defined as key/value pairs."
-        },
         "appPasswordHint": {
           "type": "string",
           "description": "The hint (e.g. keyVault secret resourceId) on how to fetch the app secret"
         },
-        "cmekEncryptionStatus": {
-          "type": "string",
-          "description": "The CMK encryption status"
-        },
         "cmekKeyVaultUrl": {
           "type": "string",
           "description": "The CMK Url"
@@ -431,17 +412,6 @@
           "type": "string",
           "description": "The Application Insights App Id"
         },
-        "disableLocalAuth": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication."
-        },
         "displayName": {
           "type": "string",
           "description": "The Name of the bot"
@@ -465,18 +435,7 @@
           ],
           "description": "Whether Cmek is enabled"
         },
-        "isDeveloperAppInsightsApiKeySet": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether the bot is developerAppInsightsApiKey set"
-        },
-        "isStreamingSupported": {
+        "isIsolated": {
           "oneOf": [
             {
               "type": "boolean"
@@ -485,7 +444,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Whether the bot is streaming supported"
+          "description": "Whether the bot is in an isolated network"
         },
         "luisAppIds": {
           "oneOf": [
@@ -505,83 +464,17 @@
           "type": "string",
           "description": "The LUIS Key"
         },
-        "manifestUrl": {
-          "type": "string",
-          "description": "The bot's manifest url"
-        },
         "msaAppId": {
           "type": "string",
           "description": "Microsoft App Id for the bot"
         },
-        "msaAppMSIResourceId": {
-          "type": "string",
-          "description": "Microsoft App Managed Identity Resource Id for the bot"
-        },
-        "msaAppTenantId": {
-          "type": "string",
-          "description": "Microsoft App Tenant Id for the bot"
-        },
-        "msaAppType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "UserAssignedMSI",
-                "SingleTenant",
-                "MultiTenant"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Microsoft App Type for the bot."
-        },
         "openWithHint": {
           "type": "string",
           "description": "The hint to browser (e.g. protocol handler) on how to open the bot for authoring"
         },
-        "parameters": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Contains resource parameters defined as key/value pairs."
-        },
-        "publicNetworkAccess": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether the bot is in an isolated network."
-        },
-        "publishingCredentials": {
-          "type": "string",
-          "description": "Publishing credentials of the resource"
-        },
         "schemaTransformationVersion": {
           "type": "string",
           "description": "The channel schema transformation version for the bot"
-        },
-        "storageResourceId": {
-          "type": "string",
-          "description": "The storage resourceId for the bot"
         }
       },
       "required": [
@@ -848,16 +741,7 @@
           "$ref": "#/definitions/DirectLineSpeechChannel"
         }
       ],
-      "properties": {
-        "etag": {
-          "type": "string",
-          "description": "Entity Tag of the resource"
-        },
-        "location": {
-          "type": "string",
-          "description": "Specifies the location of the resource."
-        }
-      },
+      "properties": {},
       "description": "Channel definition"
     },
     "ConnectionSettingParameter": {
@@ -885,14 +769,6 @@
           "type": "string",
           "description": "Client Secret associated with the Connection Setting"
         },
-        "id": {
-          "type": "string",
-          "description": "Id associated with the Connection Setting."
-        },
-        "name": {
-          "type": "string",
-          "description": "Name associated with the Connection Setting."
-        },
         "parameters": {
           "oneOf": [
             {
@@ -907,10 +783,6 @@
           ],
           "description": "Service Provider Parameters associated with the Connection Setting"
         },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
-        },
         "scopes": {
           "type": "string",
           "description": "Scopes associated with the Connection Setting"
@@ -955,10 +827,6 @@
     "DirectLineChannelProperties": {
       "type": "object",
       "properties": {
-        "DirectLineEmbedCode": {
-          "type": "string",
-          "description": "Direct Line embed code of the resource"
-        },
         "sites": {
           "oneOf": [
             {
@@ -979,17 +847,6 @@
     "DirectLineSite": {
       "type": "object",
       "properties": {
-        "isBlockUserUploadEnabled": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether this site is enabled for block user upload."
-        },
         "isEnabled": {
           "oneOf": [
             {
@@ -1434,25 +1291,10 @@
     "MsTeamsChannelProperties": {
       "type": "object",
       "properties": {
-        "acceptedTerms": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether this channel accepted terms"
-        },
         "callingWebHook": {
           "type": "string",
           "description": "Webhook for Microsoft Teams channel calls"
         },
-        "deploymentEnvironment": {
-          "type": "string",
-          "description": "Deployment environment for Microsoft Teams channel calls"
-        },
         "enableCalling": {
           "oneOf": [
             {
@@ -1464,10 +1306,6 @@
           ],
           "description": "Enable calling for Microsoft Teams channel"
         },
-        "incomingCallRoute": {
-          "type": "string",
-          "description": "Webhook for Microsoft Teams channel calls"
-        },
         "isEnabled": {
           "oneOf": [
             {
@@ -1612,10 +1450,6 @@
           "type": "string",
           "description": "Group mode for Skype channel"
         },
-        "incomingCallRoute": {
-          "type": "string",
-          "description": "Incoming call route for Skype channel"
-        },
         "isEnabled": {
           "oneOf": [
             {
@@ -1880,7 +1714,7 @@
     "WebChatSite": {
       "type": "object",
       "properties": {
-        "isEnabled": {
+        "enablePreview": {
           "oneOf": [
             {
               "type": "boolean"
@@ -1889,19 +1723,18 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Whether this site is enabled for DirectLine channel"
+          "description": "Whether this site is enabled for preview versions of Webchat"
         },
-        "isWebchatPreviewEnabled": {
+        "isEnabled": {
           "oneOf": [
             {
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Whether this site is enabled for preview versions of Webchat"
+          "description": "Whether this site is enabled for DirectLine channel"
         },
         "siteName": {
           "type": "string",
@@ -1909,8 +1742,8 @@
         }
       },
       "required": [
+        "enablePreview",
         "isEnabled",
-        "isWebchatPreviewEnabled",
         "siteName"
       ],
       "description": "A site for the Webchat channel"
diff --git a/schemas/2021-05-01-preview/Microsoft.BotService.json b/schemas/2021-05-01-preview/Microsoft.BotService.json
index 96f0f73f9e..c7e0a37d40 100644
--- a/schemas/2021-05-01-preview/Microsoft.BotService.json
+++ b/schemas/2021-05-01-preview/Microsoft.BotService.json
@@ -430,29 +430,10 @@
     "BotProperties": {
       "type": "object",
       "properties": {
-        "allSettings": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Contains resource all settings defined as key/value pairs."
-        },
         "appPasswordHint": {
           "type": "string",
           "description": "The hint (e.g. keyVault secret resourceId) on how to fetch the app secret"
         },
-        "cmekEncryptionStatus": {
-          "type": "string",
-          "description": "The CMK encryption status"
-        },
         "cmekKeyVaultUrl": {
           "type": "string",
           "description": "The CMK Url"
@@ -507,7 +488,7 @@
           ],
           "description": "Whether Cmek is enabled"
         },
-        "isDeveloperAppInsightsApiKeySet": {
+        "isIsolated": {
           "oneOf": [
             {
               "type": "boolean"
@@ -516,18 +497,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Whether the bot is developerAppInsightsApiKey set"
-        },
-        "isStreamingSupported": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether the bot is streaming supported"
+          "description": "Whether the bot is in an isolated network"
         },
         "luisAppIds": {
           "oneOf": [
@@ -547,10 +517,6 @@
           "type": "string",
           "description": "The LUIS Key"
         },
-        "manifestUrl": {
-          "type": "string",
-          "description": "The bot's manifest url"
-        },
         "msaAppId": {
           "type": "string",
           "description": "Microsoft App Id for the bot"
@@ -583,47 +549,9 @@
           "type": "string",
           "description": "The hint to browser (e.g. protocol handler) on how to open the bot for authoring"
         },
-        "parameters": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Contains resource parameters defined as key/value pairs."
-        },
-        "publicNetworkAccess": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether the bot is in an isolated network."
-        },
-        "publishingCredentials": {
-          "type": "string",
-          "description": "Publishing credentials of the resource"
-        },
         "schemaTransformationVersion": {
           "type": "string",
           "description": "The channel schema transformation version for the bot"
-        },
-        "storageResourceId": {
-          "type": "string",
-          "description": "The storage resourceId for the bot"
         }
       },
       "required": [
@@ -929,16 +857,7 @@
           "$ref": "#/definitions/DirectLineSpeechChannel"
         }
       ],
-      "properties": {
-        "etag": {
-          "type": "string",
-          "description": "Entity Tag of the resource"
-        },
-        "location": {
-          "type": "string",
-          "description": "Specifies the location of the resource."
-        }
-      },
+      "properties": {},
       "description": "Channel definition"
     },
     "ConnectionSettingParameter": {
@@ -966,14 +885,6 @@
           "type": "string",
           "description": "Client Secret associated with the Connection Setting"
         },
-        "id": {
-          "type": "string",
-          "description": "Id associated with the Connection Setting."
-        },
-        "name": {
-          "type": "string",
-          "description": "Name associated with the Connection Setting."
-        },
         "parameters": {
           "oneOf": [
             {
@@ -988,10 +899,6 @@
           ],
           "description": "Service Provider Parameters associated with the Connection Setting"
         },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
-        },
         "scopes": {
           "type": "string",
           "description": "Scopes associated with the Connection Setting"
@@ -1036,10 +943,6 @@
     "DirectLineChannelProperties": {
       "type": "object",
       "properties": {
-        "DirectLineEmbedCode": {
-          "type": "string",
-          "description": "Direct Line embed code of the resource"
-        },
         "sites": {
           "oneOf": [
             {
@@ -1060,17 +963,6 @@
     "DirectLineSite": {
       "type": "object",
       "properties": {
-        "isBlockUserUploadEnabled": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether this site is enabled for block user upload."
-        },
         "isEnabled": {
           "oneOf": [
             {
@@ -1515,25 +1407,10 @@
     "MsTeamsChannelProperties": {
       "type": "object",
       "properties": {
-        "acceptedTerms": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Whether this channel accepted terms"
-        },
         "callingWebHook": {
           "type": "string",
           "description": "Webhook for Microsoft Teams channel calls"
         },
-        "deploymentEnvironment": {
-          "type": "string",
-          "description": "Deployment environment for Microsoft Teams channel calls"
-        },
         "enableCalling": {
           "oneOf": [
             {
@@ -1545,10 +1422,6 @@
           ],
           "description": "Enable calling for Microsoft Teams channel"
         },
-        "incomingCallRoute": {
-          "type": "string",
-          "description": "Webhook for Microsoft Teams channel calls"
-        },
         "isEnabled": {
           "oneOf": [
             {
@@ -1776,10 +1649,6 @@
           "type": "string",
           "description": "Group mode for Skype channel"
         },
-        "incomingCallRoute": {
-          "type": "string",
-          "description": "Incoming call route for Skype channel"
-        },
         "isEnabled": {
           "oneOf": [
             {
@@ -2048,7 +1917,7 @@
     "WebChatSite": {
       "type": "object",
       "properties": {
-        "isEnabled": {
+        "enablePreview": {
           "oneOf": [
             {
               "type": "boolean"
@@ -2057,19 +1926,18 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Whether this site is enabled for DirectLine channel"
+          "description": "Whether this site is enabled for preview versions of Webchat"
         },
-        "isWebchatPreviewEnabled": {
+        "isEnabled": {
           "oneOf": [
             {
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Whether this site is enabled for preview versions of Webchat"
+          "description": "Whether this site is enabled for DirectLine channel"
         },
         "siteName": {
           "type": "string",
@@ -2077,8 +1945,8 @@
         }
       },
       "required": [
+        "enablePreview",
         "isEnabled",
-        "isWebchatPreviewEnabled",
         "siteName"
       ],
       "description": "A site for the Webchat channel"