diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
index 6c87c5e6a8..664aa12630 100644
--- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json
+++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -69,12 +69,6 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
               },
-              {
-                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
-              },
-              {
-                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions"
-              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2015-01-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/locks"
               },
@@ -111,6 +105,12 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
+              },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/subscription_resourceDefinitions/policyDefinitions"
               },
diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
index ccca4753e9..617b292fb7 100644
--- a/schemas/2019-08-01/managementGroupDeploymentTemplate.json
+++ b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
@@ -57,12 +57,6 @@
           },
           {
             "oneOf": [
-              {
-                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
-              },
-              {
-                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions"
-              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyassignments"
               },
@@ -84,6 +78,12 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2017-06-01-preview/Microsoft.Authorization.json#/unknown_resourceDefinitions/policyAssignments"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
+              },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Authorization.json#/managementGroup_resourceDefinitions/policyDefinitions"
               },
diff --git a/schemas/2021-04-01/Microsoft.NetApp.json b/schemas/2021-04-01/Microsoft.NetApp.json
index 0033ba3091..ba7ee89cc8 100644
--- a/schemas/2021-04-01/Microsoft.NetApp.json
+++ b/schemas/2021-04-01/Microsoft.NetApp.json
@@ -1902,7 +1902,6 @@
           "type": "string",
           "minLength": 4,
           "maxLength": 4,
-          "default": "0770",
           "description": "UNIX permissions for NFS volume accepted in octal 4 digit format. First digit selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and read/execute to group and other users."
         },
         "usageThreshold": {