diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
index a2ea7ad574..f58a0be1bf 100644
--- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json
+++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -1049,6 +1049,9 @@
             {
               "$ref": "https://schema.management.azure.com/schemas/2021-06-01/Microsoft.Security.json#/unknown_resourceDefinitions/assessments"
             },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2021-07-01/Microsoft.Security.json#/subscription_resourceDefinitions/settings"
+            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2019-05-01-preview/Microsoft.Support.json#/subscription_resourceDefinitions/supportTickets"
             },
diff --git a/schemas/2021-06-01/Microsoft.Security.json b/schemas/2021-06-01/Microsoft.Security.json
index 3ddcef0580..8324cd740c 100644
--- a/schemas/2021-06-01/Microsoft.Security.json
+++ b/schemas/2021-06-01/Microsoft.Security.json
@@ -5,45 +5,6 @@
   "description": "Microsoft Security Resource Types",
   "resourceDefinitions": {},
   "subscription_resourceDefinitions": {
-    "assessmentMetadata": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2021-06-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The Assessment Key - Unique key for the assessment type"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAssessmentMetadataProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Describes properties of an assessment metadata."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Security/assessmentMetadata"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Security/assessmentMetadata"
-    },
     "settings": {
       "type": "object",
       "oneOf": [
@@ -92,47 +53,6 @@
       "description": "Microsoft.Security/settings"
     }
   },
-  "unknown_resourceDefinitions": {
-    "assessments": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2021-06-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The Assessment Key - Unique key for the assessment type"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAssessmentProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Describes properties of an assessment."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Security/assessments"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Security/assessments"
-    }
-  },
   "definitions": {
     "AlertSyncSettingProperties": {
       "type": "object",
@@ -180,59 +100,6 @@
       ],
       "description": "Represents an alert sync setting"
     },
-    "AssessmentLinks": {
-      "type": "object",
-      "properties": {},
-      "description": "Links relevant to the assessment"
-    },
-    "AssessmentStatus": {
-      "type": "object",
-      "properties": {
-        "cause": {
-          "type": "string",
-          "description": "Programmatic code for the cause of the assessment status"
-        },
-        "code": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Healthy",
-                "Unhealthy",
-                "NotApplicable"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Programmatic code for the status of the assessment."
-        },
-        "description": {
-          "type": "string",
-          "description": "Human readable description of the assessment status"
-        }
-      },
-      "required": [
-        "code"
-      ],
-      "description": "The result of the assessment"
-    },
-    "AzureResourceDetails": {
-      "type": "object",
-      "properties": {
-        "source": {
-          "type": "string",
-          "enum": [
-            "Azure"
-          ]
-        }
-      },
-      "required": [
-        "source"
-      ],
-      "description": "Details of the Azure resource that was assessed"
-    },
     "DataExportSettingProperties": {
       "type": "object",
       "properties": {
@@ -278,357 +145,6 @@
         "kind"
       ],
       "description": "Represents a data export setting"
-    },
-    "OnPremiseResourceDetails": {
-      "type": "object",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/OnPremiseSqlResourceDetails"
-        }
-      ],
-      "properties": {
-        "machineName": {
-          "type": "string",
-          "description": "The name of the machine"
-        },
-        "source": {
-          "type": "string",
-          "enum": [
-            "OnPremise"
-          ]
-        },
-        "sourceComputerId": {
-          "type": "string",
-          "description": "The oms agent Id installed on the machine"
-        },
-        "vmuuid": {
-          "type": "string",
-          "description": "The unique Id of the machine"
-        },
-        "workspaceId": {
-          "type": "string",
-          "description": "Azure resource Id of the workspace the machine is attached to"
-        }
-      },
-      "required": [
-        "machineName",
-        "source",
-        "sourceComputerId",
-        "vmuuid",
-        "workspaceId"
-      ],
-      "description": "Details of the On Premise resource that was assessed"
-    },
-    "OnPremiseSqlResourceDetails": {
-      "type": "object",
-      "properties": {
-        "databaseName": {
-          "type": "string",
-          "description": "The Sql database name installed on the machine"
-        },
-        "serverName": {
-          "type": "string",
-          "description": "The Sql server name installed on the machine"
-        },
-        "source": {
-          "type": "string",
-          "enum": [
-            "OnPremiseSql"
-          ]
-        }
-      },
-      "required": [
-        "databaseName",
-        "serverName",
-        "source"
-      ],
-      "description": "Details of the On Premise Sql resource that was assessed"
-    },
-    "ResourceDetails": {
-      "type": "object",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/AzureResourceDetails"
-        },
-        {
-          "$ref": "#/definitions/OnPremiseResourceDetails"
-        }
-      ],
-      "properties": {},
-      "description": "Details of the resource that was assessed"
-    },
-    "SecurityAssessmentMetadataPartnerData": {
-      "type": "object",
-      "properties": {
-        "partnerName": {
-          "type": "string",
-          "description": "Name of the company of the partner"
-        },
-        "productName": {
-          "type": "string",
-          "description": "Name of the product of the partner that created the assessment"
-        },
-        "secret": {
-          "type": "string",
-          "description": "Secret to authenticate the partner and verify it created the assessment - write only"
-        }
-      },
-      "required": [
-        "partnerName",
-        "secret"
-      ],
-      "description": "Describes the partner that created the assessment"
-    },
-    "SecurityAssessmentMetadataProperties": {
-      "type": "object",
-      "properties": {
-        "assessmentType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "BuiltIn",
-                "CustomPolicy",
-                "CustomerManaged",
-                "VerifiedPartner"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "BuiltIn if the assessment based on built-in Azure Policy definition, Custom if the assessment based on custom Azure Policy definition."
-        },
-        "categories": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string",
-                "enum": [
-                  "Compute",
-                  "Networking",
-                  "Data",
-                  "IdentityAndAccess",
-                  "IoT"
-                ]
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "description": {
-          "type": "string",
-          "description": "Human readable description of the assessment"
-        },
-        "displayName": {
-          "type": "string",
-          "description": "User friendly display name of the assessment"
-        },
-        "implementationEffort": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Low",
-                "Moderate",
-                "High"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The implementation effort required to remediate this assessment."
-        },
-        "partnerData": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAssessmentMetadataPartnerData"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Describes the partner that created the assessment"
-        },
-        "preview": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "True if this assessment is in preview release status"
-        },
-        "remediationDescription": {
-          "type": "string",
-          "description": "Human readable description of what you should do to mitigate this security issue"
-        },
-        "severity": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Low",
-                "Medium",
-                "High"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The severity level of the assessment."
-        },
-        "threats": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string",
-                "enum": [
-                  "accountBreach",
-                  "dataExfiltration",
-                  "dataSpillage",
-                  "maliciousInsider",
-                  "elevationOfPrivilege",
-                  "threatResistance",
-                  "missingCoverage",
-                  "denialOfService"
-                ]
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "userImpact": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Low",
-                "Moderate",
-                "High"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The user impact of the assessment."
-        }
-      },
-      "required": [
-        "assessmentType",
-        "displayName",
-        "severity"
-      ],
-      "description": "Describes properties of an assessment metadata."
-    },
-    "SecurityAssessmentPartnerData": {
-      "type": "object",
-      "properties": {
-        "partnerName": {
-          "type": "string",
-          "description": "Name of the company of the partner"
-        },
-        "secret": {
-          "type": "string",
-          "description": "secret to authenticate the partner - write only"
-        }
-      },
-      "required": [
-        "partnerName",
-        "secret"
-      ],
-      "description": "Data regarding 3rd party partner integration"
-    },
-    "SecurityAssessmentProperties": {
-      "type": "object",
-      "properties": {
-        "additionalData": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Additional data regarding the assessment"
-        },
-        "links": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/AssessmentLinks"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Links relevant to the assessment"
-        },
-        "metadata": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAssessmentMetadataProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Describes properties of an assessment metadata."
-        },
-        "partnersData": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAssessmentPartnerData"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Data regarding 3rd party partner integration"
-        },
-        "resourceDetails": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ResourceDetails"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Details of the resource that was assessed"
-        },
-        "status": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/AssessmentStatus"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The result of the assessment"
-        }
-      },
-      "required": [
-        "resourceDetails",
-        "status"
-      ],
-      "description": "Describes properties of an assessment."
     }
   }
 }
\ No newline at end of file
diff --git a/schemas/2021-07-01-preview/Microsoft.Security.json b/schemas/2021-07-01-preview/Microsoft.Security.json
deleted file mode 100644
index 3cc7e77e41..0000000000
--- a/schemas/2021-07-01-preview/Microsoft.Security.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2021-07-01-preview/Microsoft.Security.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Security",
-  "description": "Microsoft Security Resource Types",
-  "resourceDefinitions": {
-    "securityConnectors": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2021-07-01-preview"
-          ]
-        },
-        "etag": {
-          "type": "string",
-          "description": "Entity tag is used for comparing two or more entities from the same requested resource."
-        },
-        "kind": {
-          "type": "string",
-          "description": "Kind of the resource"
-        },
-        "location": {
-          "type": "string",
-          "description": "Location where the resource is stored"
-        },
-        "name": {
-          "type": "string",
-          "description": "The security connector name."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityConnectorProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A set of properties that defines the security connector configuration."
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A list of key value pairs that describe the resource."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Security/securityConnectors"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Security/securityConnectors"
-    }
-  },
-  "definitions": {
-    "CSPMMonitorAWSOffering": {
-      "type": "object",
-      "properties": {
-        "nativeCloudConnection": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/CSPMMonitorAWSOfferingNativeCloudConnection"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The native cloud connection configuration"
-        },
-        "offeringType": {
-          "type": "string",
-          "enum": [
-            "CSPMMonitorAWS"
-          ]
-        }
-      },
-      "required": [
-        "offeringType"
-      ],
-      "description": "The CSPM monitoring for AWS offering configurations"
-    },
-    "CSPMMonitorAWSOfferingNativeCloudConnection": {
-      "type": "object",
-      "properties": {
-        "cloudRoleArn": {
-          "type": "string",
-          "description": "The cloud role ARN in AWS for this feature"
-        }
-      },
-      "description": "The native cloud connection configuration"
-    },
-    "MultiCloudOffering": {
-      "type": "object",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/CSPMMonitorAWSOffering"
-        }
-      ],
-      "properties": {},
-      "description": "The security offering details"
-    },
-    "SecurityConnectorProperties": {
-      "type": "object",
-      "properties": {
-        "hierarchyId": {
-          "type": "string",
-          "description": "The multi cloud resource identifier (account id in case of AWS connector)."
-        },
-        "multiCloudName": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Azure",
-                "AWS",
-                "GCP"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The multi cloud resource's cloud name."
-        },
-        "offerings": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/MultiCloudOffering"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A collection of offerings for the security connector."
-        }
-      },
-      "description": "A set of properties that defines the security connector configuration."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2021-07-01/Microsoft.Security.json b/schemas/2021-07-01/Microsoft.Security.json
new file mode 100644
index 0000000000..8c5cade66a
--- /dev/null
+++ b/schemas/2021-07-01/Microsoft.Security.json
@@ -0,0 +1,151 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2021-07-01/Microsoft.Security.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Security",
+  "description": "Microsoft Security Resource Types",
+  "resourceDefinitions": {},
+  "subscription_resourceDefinitions": {
+    "settings": {
+      "type": "object",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/DataExportSettings"
+        },
+        {
+          "$ref": "#/definitions/AlertSyncSettings"
+        }
+      ],
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-07-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "MCAS",
+                "WDATP",
+                "WDATP_EXCLUDE_LINUX_PUBLIC_PREVIEW",
+                "Sentinel"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the setting."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Security/settings"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Security/settings"
+    }
+  },
+  "definitions": {
+    "AlertSyncSettingProperties": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Is the alert sync setting enabled"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "description": "The alert sync setting properties"
+    },
+    "AlertSyncSettings": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "enum": [
+            "AlertSyncSettings"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AlertSyncSettingProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The alert sync setting properties"
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "description": "Represents an alert sync setting"
+    },
+    "DataExportSettingProperties": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Is the data export setting enabled"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "description": "The data export setting properties"
+    },
+    "DataExportSettings": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "enum": [
+            "DataExportSettings"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DataExportSettingProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The data export setting properties"
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "description": "Represents a data export setting"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 25f6fcdba4..dc8214f3bc 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -8446,12 +8446,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-08-06-preview/Microsoft.Security.json#/unknown_resourceDefinitions/iotSites"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2021-06-01/Microsoft.Security.json#/unknown_resourceDefinitions/assessments"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2021-07-01-preview/Microsoft.Security.json#/resourceDefinitions/securityConnectors"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces"
         },