diff --git a/schemas/2021-03-01/Microsoft.BotService.json b/schemas/2021-03-01/Microsoft.BotService.json
index 0b1e597f4a..d0e42847df 100644
--- a/schemas/2021-03-01/Microsoft.BotService.json
+++ b/schemas/2021-03-01/Microsoft.BotService.json
@@ -578,6 +578,10 @@
         "schemaTransformationVersion": {
           "type": "string",
           "description": "The channel schema transformation version for the bot"
+        },
+        "storageResourceId": {
+          "type": "string",
+          "description": "The storage resourceId for the bot"
         }
       },
       "required": [
@@ -848,6 +852,10 @@
         "etag": {
           "type": "string",
           "description": "Entity Tag of the resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Specifies the location of the resource."
         }
       },
       "description": "Channel definition"
@@ -877,6 +885,14 @@
           "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": [
             {
@@ -919,10 +935,6 @@
             "DirectLineChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -933,10 +945,6 @@
             }
           ],
           "description": "The parameters to provide for the Direct Line channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1406,10 +1414,6 @@
             "MsTeamsChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -1420,10 +1424,6 @@
             }
           ],
           "description": "The parameters to provide for the Microsoft Teams channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1840,10 +1840,6 @@
             "WebChatChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -1854,10 +1850,6 @@
             }
           ],
           "description": "The parameters to provide for the Web Chat channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1902,7 +1894,8 @@
         "isWebchatPreviewEnabled": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
diff --git a/schemas/2021-05-01-preview/Microsoft.BotService.json b/schemas/2021-05-01-preview/Microsoft.BotService.json
index e7f767a3c4..96f0f73f9e 100644
--- a/schemas/2021-05-01-preview/Microsoft.BotService.json
+++ b/schemas/2021-05-01-preview/Microsoft.BotService.json
@@ -620,6 +620,10 @@
         "schemaTransformationVersion": {
           "type": "string",
           "description": "The channel schema transformation version for the bot"
+        },
+        "storageResourceId": {
+          "type": "string",
+          "description": "The storage resourceId for the bot"
         }
       },
       "required": [
@@ -929,6 +933,10 @@
         "etag": {
           "type": "string",
           "description": "Entity Tag of the resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Specifies the location of the resource."
         }
       },
       "description": "Channel definition"
@@ -958,6 +966,14 @@
           "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": [
             {
@@ -1000,10 +1016,6 @@
             "DirectLineChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -1014,10 +1026,6 @@
             }
           ],
           "description": "The parameters to provide for the Direct Line channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1153,10 +1161,6 @@
             }
           ],
           "description": "The parameters to provide for the DirectLine Speech channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1231,10 +1235,6 @@
             }
           ],
           "description": "The parameters to provide for the Email channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1280,10 +1280,6 @@
             "FacebookChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -1294,10 +1290,6 @@
             }
           ],
           "description": "The parameters to provide for the Facebook channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1503,10 +1495,6 @@
             "MsTeamsChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -1517,10 +1505,6 @@
             }
           ],
           "description": "The parameters to provide for the Microsoft Teams channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -1822,10 +1806,6 @@
             "SlackChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -1977,10 +1957,6 @@
             }
           ],
           "description": "The parameters to provide for the Telegram channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -2032,10 +2008,6 @@
             "WebChatChannel"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "Location of the resource"
-        },
         "properties": {
           "oneOf": [
             {
@@ -2046,10 +2018,6 @@
             }
           ],
           "description": "The parameters to provide for the Web Chat channel."
-        },
-        "provisioningState": {
-          "type": "string",
-          "description": "Provisioning state of the resource"
         }
       },
       "required": [
@@ -2094,7 +2062,8 @@
         "isWebchatPreviewEnabled": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"