diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/patchComputeQuotaRequest.json b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/patchComputeQuotaRequest.json
index b884e097975a..131121b5759f 100644
--- a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/patchComputeQuotaRequest.json
+++ b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/patchComputeQuotaRequest.json
@@ -33,21 +33,15 @@
         "name": "2B5C8515-37D8-4B6A-879B-CD641A2CF605",
         "type": "Microsoft.Capacity/serviceLimits",
         "properties": {
-          "provisioningState": "Succeeded",
-          "message": "",
-          "properties": {
-            "properties": {
-              "limit": 200,
-              "unit": "Count",
-              "currentValue": 160,
-              "name": {
-                "value": "standardFSv2Family",
-                "localizedValue": "Standard FSv2 Family vCPUs"
-              },
-              "quotaPeriod": "",
-              "properties": {}
-            }
-          }
+          "limit": 200,
+          "unit": "Count",
+          "currentValue": 160,
+          "name": {
+            "value": "standardFSv2Family",
+            "localizedValue": "Standard FSv2 Family vCPUs"
+          },
+          "quotaPeriod": "",
+          "properties": {}
         }
       }
     }
diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putComputeOneSkuQuotaRequest.json b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putComputeOneSkuQuotaRequest.json
index 7184e2231b8a..131121b5759f 100644
--- a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putComputeOneSkuQuotaRequest.json
+++ b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putComputeOneSkuQuotaRequest.json
@@ -33,21 +33,15 @@
         "name": "2B5C8515-37D8-4B6A-879B-CD641A2CF605",
         "type": "Microsoft.Capacity/serviceLimits",
         "properties": {
-          "provisioningState": "Succeeded",
-          "message": "Request succeeded",
-          "properties": {
-            "properties": {
-              "limit": 200,
-              "unit": "Count",
-              "currentValue": 160,
-              "name": {
-                "value": "standardFSv2Family",
-                "localizedValue": "Standard FSv2 Family vCPUs"
-              },
-              "quotaPeriod": "",
-              "properties": {}
-            }
-          }
+          "limit": 200,
+          "unit": "Count",
+          "currentValue": 160,
+          "name": {
+            "value": "standardFSv2Family",
+            "localizedValue": "Standard FSv2 Family vCPUs"
+          },
+          "quotaPeriod": "",
+          "properties": {}
         }
       }
     }
diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestDedicated.json b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestDedicated.json
index 280a446a7360..f9335c70d5cc 100644
--- a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestDedicated.json
+++ b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestDedicated.json
@@ -34,22 +34,16 @@
         "name": "2B5C8515-37D8-4B6A-879B-CD641A2CF605",
         "type": "Microsoft.Capacity/serviceLimits",
         "properties": {
-          "provisioningState": "Succeeded",
-          "message": "Request succeeded",
-          "properties": {
-            "properties": {
-              "limit": 200,
-              "unit": "Count",
-              "currentValue": 160,
-              "name": {
-                "value": "StandardDv2Family",
-                "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs"
-              },
-              "resourceType": "dedicated",
-              "quotaPeriod": "",
-              "properties": {}
-            }
-          }
+          "limit": 200,
+          "unit": "Count",
+          "currentValue": 160,
+          "name": {
+            "value": "StandardDv2Family",
+            "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs"
+          },
+          "resourceType": "dedicated",
+          "quotaPeriod": "",
+          "properties": {}
         }
       }
     }
diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestLowPriority.json b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestLowPriority.json
index d4f7b2bee919..342951f5658c 100644
--- a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestLowPriority.json
+++ b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/examples/putMachineLearningServicesQuotaRequestLowPriority.json
@@ -34,22 +34,16 @@
         "name": "2B5C8515-37D8-4B6A-879B-CD641A2CF605",
         "type": "Microsoft.Capacity/serviceLimits",
         "properties": {
-          "provisioningState": "Succeeded",
-          "message": "Request succeeded",
-          "properties": {
-            "properties": {
-              "limit": 200,
-              "unit": "Count",
-              "currentValue": 160,
-              "name": {
-                "value": "TotalLowPriorityCores",
-                "localizedValue": "Total Cluster Low Priority Regional vCPUs"
-              },
-              "resourceType": "lowPriority",
-              "quotaPeriod": "",
-              "properties": {}
-            }
-          }
+          "limit": 200,
+          "unit": "Count",
+          "currentValue": 160,
+          "name": {
+            "value": "TotalLowPriorityCores",
+            "localizedValue": "Total Cluster Low Priority Regional vCPUs"
+          },
+          "resourceType": "lowPriority",
+          "quotaPeriod": "",
+          "properties": {}
         }
       }
     }
diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/quota.json b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/quota.json
index 008d504138ae..3cb37bc1dbc2 100644
--- a/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/quota.json
+++ b/specification/reservations/resource-manager/Microsoft.Capacity/stable/2020-10-25/quota.json
@@ -103,7 +103,7 @@
         },
         "x-ms-long-running-operation": true,
         "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
+          "final-state-via": "original-uri"
         },
         "parameters": [
           {
@@ -135,7 +135,7 @@
           "200": {
             "description": "OK. Returns details of the quota request.",
             "schema": {
-              "$ref": "#/definitions/QuotaRequestOneResourceSubmitResponse"
+              "$ref": "#/definitions/CurrentQuotaLimitBase"
             }
           },
           "201": {
@@ -165,7 +165,7 @@
         },
         "x-ms-long-running-operation": true,
         "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
+          "final-state-via": "original-uri"
         },
         "parameters": [
           {
@@ -197,7 +197,7 @@
           "200": {
             "description": "OK. Returns details of the quota request.",
             "schema": {
-              "$ref": "#/definitions/QuotaRequestOneResourceSubmitResponse"
+              "$ref": "#/definitions/CurrentQuotaLimitBase"
             }
           },
           "201": {
@@ -402,6 +402,21 @@
       "description": "Quota properties.",
       "x-ms-azure-resource": true,
       "properties": {
+        "id": {
+          "description": "The quota request ID.",
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "description": "The name of the quota request.",
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Type of resource. \"Microsoft.Capacity/ServiceLimits\""
+        },
         "properties": {
           "description": "Quota properties for the resource.",
           "$ref": "#/definitions/QuotaProperties"
@@ -414,11 +429,13 @@
       "properties": {
         "limit": {
           "description": "Quota properties.",
-          "type": "integer"
+          "type": "integer",
+          "format": "int32"
         },
         "currentValue": {
           "description": "Current usage value for the resource.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "unit": {
@@ -513,6 +530,7 @@
         "limit": {
           "description": "Quota (resource limit).",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "name": {