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-05-01/Microsoft.Synapse.json b/schemas/2021-05-01/Microsoft.Synapse.json
index 24d020e9c5..db2c522864 100644
--- a/schemas/2021-05-01/Microsoft.Synapse.json
+++ b/schemas/2021-05-01/Microsoft.Synapse.json
@@ -1752,7 +1752,9 @@
               "type": "string",
               "enum": [
                 "None",
-                "MemoryOptimized"
+                "MemoryOptimized",
+                "HardwareAcceleratedFPGA",
+                "HardwareAcceleratedGPU"
               ]
             },
             {