diff --git a/scripts/multiapi.ts b/scripts/multiapi.ts
index 45659c28ba9d..8210ef82e099 100644
--- a/scripts/multiapi.ts
+++ b/scripts/multiapi.ts
@@ -11,14 +11,15 @@ import * as yaml from "js-yaml"
 type Code = {
   readonly "input-file"?: ReadonlyArray<string>|string
 }
-const yamlBegin = `yaml $(tag) == 'all-api-versions' /* autogenerated */`;
+const magic = `yaml $(tag) == 'all-api-versions' /* autogenerated */`;
+const pathRegex = /microsoft\.(\w+)\/\S*\/(\d{4}-\d{2}-\d{2}(|-preview))\//i;
 
-const main = async (specificationDir: string, profilesDir: string) => {
+const main = async (specificationDir: string) => {
   try {
     const list = fs.recursiveReaddir(specificationDir)
     for await (const file of list) {
       const f = path.parse(file)
-      if (f.base === "readme.md") {
+      if (f.base === "readme.md" && f.dir.endsWith('/resource-manager')) {
         const original_content = (await fs.readFile(file)).toString()
         let content = original_content;
         const readMe = cm.parse(content)
@@ -27,7 +28,7 @@ const main = async (specificationDir: string, profilesDir: string) => {
           if (
             c.type === "code_block" &&
             c.info !== null &&
-            (c.info.startsWith("yaml") && !c.info.startsWith(yamlBegin)) &&
+            (c.info.startsWith("yaml") && !c.info.startsWith(magic)) &&
             c.literal !== null
           ) {
             const DOC = (yaml.load(c.literal) as Code);
@@ -41,10 +42,24 @@ const main = async (specificationDir: string, profilesDir: string) => {
                 }
               }
             }
-            
           }
         }
-        const block = 
+        let map = new Map<string, string[]>();
+        for (let input of set) {
+          let match = pathRegex.exec(input);
+          if (!!match) {
+            let tagName = `schema-${match[1].toLowerCase()}-${match[2]}`;
+            if (!map.has(tagName)) {
+              map.set(tagName, []);
+            }
+            let array = map.get(tagName);
+            if (!!array) {
+              array.push(input);
+            }
+          }
+        }
+        map = new Map(Array.from(map.entries()).sort().reverse());
+        let schemaReadmeContent = 
 `## AzureResourceSchema
 
 These settings apply only when \`--azureresourceschema\` is specified on the command line.
@@ -52,27 +67,36 @@ These settings apply only when \`--azureresourceschema\` is specified on the com
 ### AzureResourceSchema multi-api
 
 \`\`\` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ${path.relative(f.dir, profilesDir).replace(/\\/g, '/')}/readme.md
+${yaml.dump({ 'batch': it.toArray(it.map(map.keys(), (tagName) => ({'tag': tagName})))}, { lineWidth: 1000})}
+\`\`\`
 
+Please also specify \`--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>\`.
+`
+        map.forEach((inputList, tagName) => {
+          schemaReadmeContent += 
+`
+### Tag: ${tagName} and azureresourceschema
+
+\`\`\` yaml $(tag) == '${tagName}' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
-${yaml.dump({ 'input-file': it.toArray(set) },{ lineWidth: 1000 } )}
-\`\`\``
-        content = content.replace( /``` yaml \$\(tag\) == 'all-api-versions' \/\* autogenerated \*\/[\S\s]*?```/g, '')
-        content = content.replace( /``` yaml \$\(tag\) == 'all-api-versions'[\S\s]*?```/g, '')
-        content = content.replace( /## Multi-API\/Profile support for AutoRest v3 generators[\S\s]*/g, '')
+# all the input files in this apiVersion
+${yaml.dump({ 'input-file': it.toArray(inputList)}, { lineWidth: 1000})}
+\`\`\`
+`
+        });
 
-        if(original_content !== content ){
-          console.log(`Updating: ${file}`);
-          fs.writeFile(path.join(f.dir, "readme.md"), content)
-        }
+        // content = content.replace( /``` yaml \$\(tag\) == 'all-api-versions' \/\* autogenerated \*\/[\S\s]*?```/g, '')
+        // content = content.replace( /``` yaml \$\(tag\) == 'all-api-versions'[\S\s]*?```/g, '')
+        // content = content.replace( /## Multi-API\/Profile support for AutoRest v3 generators[\S\s]*/g, '')
 
-        if (f.dir.endsWith('/resource-manager')) {
-          console.log(`Rewriting: ${f.dir}/readme.azureresourceschema.md`);
-          fs.writeFile(path.join(f.dir, "readme.azureresourceschema.md"), block);
-        }
+        // if(original_content !== content ){
+        //   console.log(`Updating: ${file}`);
+        //   fs.writeFile(path.join(f.dir, "readme.md"), content)
+        // }
+
+        console.log(`Rewriting: ${f.dir}/readme.azureresourceschema.md`);
+        fs.writeFile(path.join(f.dir, "readme.azureresourceschema.md"), schemaReadmeContent);
         
       }
     }
@@ -81,4 +105,4 @@ ${yaml.dump({ 'input-file': it.toArray(set) },{ lineWidth: 1000 } )}
   }
 }
 
-main(path.join(process.cwd(), "specification"), path.join(process.cwd(), "profiles"))
+main(path.join(process.cwd(), "specification"))
diff --git a/specification/EnterpriseKnowledgeGraph/resource-manager/readme.azureresourceschema.md b/specification/EnterpriseKnowledgeGraph/resource-manager/readme.azureresourceschema.md
index f8d8e9e5f9a7..b91b439d843d 100644
--- a/specification/EnterpriseKnowledgeGraph/resource-manager/readme.azureresourceschema.md
+++ b/specification/EnterpriseKnowledgeGraph/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-enterpriseknowledgegraph-2018-12-03
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-enterpriseknowledgegraph-2018-12-03 and azureresourceschema
+
+``` yaml $(tag) == 'schema-enterpriseknowledgegraph-2018-12-03' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.EnterpriseKnowledgeGraph/preview/2018-12-03/EnterpriseKnowledgeGraphSwagger.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/addons/resource-manager/readme.azureresourceschema.md b/specification/addons/resource-manager/readme.azureresourceschema.md
index a52836caac18..ae05babd8222 100644
--- a/specification/addons/resource-manager/readme.azureresourceschema.md
+++ b/specification/addons/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-addons-2018-03-01
+  - tag: schema-addons-2017-05-15
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-addons-2018-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-addons-2018-03-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Addons/preview/2018-03-01/addons-swagger.json
+
+```
+
+### Tag: schema-addons-2017-05-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-addons-2017-05-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Addons/preview/2017-05-15/Addons.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/adhybridhealthservice/resource-manager/readme.azureresourceschema.md b/specification/adhybridhealthservice/resource-manager/readme.azureresourceschema.md
index 8aa55cafc3f0..2ed4e21a2173 100644
--- a/specification/adhybridhealthservice/resource-manager/readme.azureresourceschema.md
+++ b/specification/adhybridhealthservice/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,8 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch: []
 
-output-folder: $(azureresourceschema-folder)/schemas
+```
 
-# all the input files across all versions
-input-file:
-  - Microsoft.ADHybridHealthService\stable\2014-01-01\ADHybridHealthService.json
-
-```
\ No newline at end of file
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
diff --git a/specification/advisor/resource-manager/readme.azureresourceschema.md b/specification/advisor/resource-manager/readme.azureresourceschema.md
index 4e976457378b..8419f1c1778c 100644
--- a/specification/advisor/resource-manager/readme.azureresourceschema.md
+++ b/specification/advisor/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,68 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-advisor-2020-07-01-preview
+  - tag: schema-advisor-2020-01-01
+  - tag: schema-advisor-2017-04-19
+  - tag: schema-advisor-2017-03-31
+  - tag: schema-advisor-2016-07-12-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-advisor-2020-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-advisor-2020-07-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Advisor/preview/2020-07-01-preview/advisor.json
+
+```
+
+### Tag: schema-advisor-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-advisor-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Advisor/stable/2020-01-01/advisor.json
+
+```
+
+### Tag: schema-advisor-2017-04-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-advisor-2017-04-19' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Advisor/stable/2017-04-19/advisor.json
+
+```
+
+### Tag: schema-advisor-2017-03-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-advisor-2017-03-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Advisor/stable/2017-03-31/advisor.json
+
+```
+
+### Tag: schema-advisor-2016-07-12-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-advisor-2016-07-12-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Advisor/preview/2016-07-12-preview/advisor.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/alertsmanagement/resource-manager/readme.azureresourceschema.md b/specification/alertsmanagement/resource-manager/readme.azureresourceschema.md
index 49dcef59ac4e..87dbe102b007 100644
--- a/specification/alertsmanagement/resource-manager/readme.azureresourceschema.md
+++ b/specification/alertsmanagement/resource-manager/readme.azureresourceschema.md
@@ -5,20 +5,71 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-alertsmanagement-2019-06-01
+  - tag: schema-alertsmanagement-2019-05-05-preview
+  - tag: schema-alertsmanagement-2019-03-01
+  - tag: schema-alertsmanagement-2018-05-05-preview
+  - tag: schema-alertsmanagement-2018-05-05
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-alertsmanagement-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-alertsmanagement-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.AlertsManagement/stable/2019-06-01/SmartDetectorAlertRulesApi.json
+
+```
+
+### Tag: schema-alertsmanagement-2019-05-05-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-alertsmanagement-2019-05-05-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AlertsManagement/preview/2019-05-05-preview/ActionRules.json
   - Microsoft.AlertsManagement/preview/2019-05-05-preview/AlertsManagement.json
   - Microsoft.AlertsManagement/preview/2019-05-05-preview/SmartGroups.json
-  - Microsoft.AlertsManagement/stable/2019-06-01/SmartDetectorAlertRulesApi.json
+
+```
+
+### Tag: schema-alertsmanagement-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-alertsmanagement-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AlertsManagement/stable/2019-03-01/AlertsManagement.json
   - Microsoft.AlertsManagement/stable/2019-03-01/SmartDetectorAlertRulesApi.json
-  - Microsoft.AlertsManagement/stable/2018-05-05/AlertsManagement.json
+
+```
+
+### Tag: schema-alertsmanagement-2018-05-05-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-alertsmanagement-2018-05-05-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AlertsManagement/preview/2018-05-05-preview/AlertsManagement.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-alertsmanagement-2018-05-05 and azureresourceschema
+
+``` yaml $(tag) == 'schema-alertsmanagement-2018-05-05' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.AlertsManagement/stable/2018-05-05/AlertsManagement.json
+
+```
diff --git a/specification/analysisservices/resource-manager/readme.azureresourceschema.md b/specification/analysisservices/resource-manager/readme.azureresourceschema.md
index 4be7a9baee69..d89301b2b8b3 100644
--- a/specification/analysisservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/analysisservices/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-analysisservices-2017-08-01
+  - tag: schema-analysisservices-2017-07-14
+  - tag: schema-analysisservices-2016-05-16
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-analysisservices-2017-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-analysisservices-2017-08-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AnalysisServices/stable/2017-08-01/analysisservices.json
-  - Microsoft.AnalysisServices/preview/2017-08-01-beta/analysisservices.json
+
+```
+
+### Tag: schema-analysisservices-2017-07-14 and azureresourceschema
+
+``` yaml $(tag) == 'schema-analysisservices-2017-07-14' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json
+
+```
+
+### Tag: schema-analysisservices-2016-05-16 and azureresourceschema
+
+``` yaml $(tag) == 'schema-analysisservices-2016-05-16' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/apimanagement/resource-manager/readme.azureresourceschema.md b/specification/apimanagement/resource-manager/readme.azureresourceschema.md
index f0552d80133a..7afd9c95a116 100644
--- a/specification/apimanagement/resource-manager/readme.azureresourceschema.md
+++ b/specification/apimanagement/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,70 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-apimanagement-2019-12-01-preview
+  - tag: schema-apimanagement-2019-12-01
+  - tag: schema-apimanagement-2019-01-01
+  - tag: schema-apimanagement-2018-06-01-preview
+  - tag: schema-apimanagement-2018-01-01
+  - tag: schema-apimanagement-2017-03-01
+  - tag: schema-apimanagement-2016-10-10
+  - tag: schema-apimanagement-2016-07-07
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-apimanagement-2019-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2019-12-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimanagement.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimapis.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimapisByTags.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimapiversionsets.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimauthorizationservers.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimbackends.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimcaches.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimcertificates.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimdeployment.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimdiagnostics.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimemailtemplates.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimgateways.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimgroups.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimidentityprovider.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimissues.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimloggers.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimnetworkstatus.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimnotifications.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimopenidconnectproviders.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimpolicies.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimpolicydescriptions.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimportalsettings.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimproducts.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimproductsByTags.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimnamedvalues.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimquotas.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimregions.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimreports.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimsubscriptions.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimtagresources.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimtags.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimtenant.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimusers.json
+  - Microsoft.ApiManagement/preview/2019-12-01-preview/definitions.json
+
+```
+
+### Tag: schema-apimanagement-2019-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2019-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ApiManagement/stable/2019-12-01/apimanagement.json
   - Microsoft.ApiManagement/stable/2019-12-01/apimapis.json
@@ -47,40 +105,16 @@ input-file:
   - Microsoft.ApiManagement/stable/2019-12-01/apimtenant.json
   - Microsoft.ApiManagement/stable/2019-12-01/apimusers.json
   - Microsoft.ApiManagement/stable/2019-12-01/definitions.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimanagement.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimapis.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimapisByTags.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimapiversionsets.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimauthorizationservers.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimbackends.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimcaches.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimcertificates.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimdeployment.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimdiagnostics.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimemailtemplates.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimgateways.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimgroups.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimidentityprovider.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimissues.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimloggers.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimnetworkstatus.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimnotifications.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimopenidconnectproviders.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimpolicies.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimpolicydescriptions.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimportalsettings.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimproducts.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimproductsByTags.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimnamedvalues.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimquotas.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimregions.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimreports.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimsubscriptions.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimtagresources.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimtags.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimtenant.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/apimusers.json
-  - Microsoft.ApiManagement/preview/2019-12-01-preview/definitions.json
+
+```
+
+### Tag: schema-apimanagement-2019-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2019-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ApiManagement/stable/2019-01-01/apimanagement.json
   - Microsoft.ApiManagement/stable/2019-01-01/apimapis.json
   - Microsoft.ApiManagement/stable/2019-01-01/apimapisByTags.json
@@ -114,6 +148,16 @@ input-file:
   - Microsoft.ApiManagement/stable/2019-01-01/apimtenant.json
   - Microsoft.ApiManagement/stable/2019-01-01/apimusers.json
   - Microsoft.ApiManagement/stable/2019-01-01/definitions.json
+
+```
+
+### Tag: schema-apimanagement-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ApiManagement/preview/2018-06-01-preview/apimanagement.json
   - Microsoft.ApiManagement/preview/2018-06-01-preview/apimapis.json
   - Microsoft.ApiManagement/preview/2018-06-01-preview/apimapisByTags.json
@@ -147,6 +191,16 @@ input-file:
   - Microsoft.ApiManagement/preview/2018-06-01-preview/apimusers.json
   - Microsoft.ApiManagement/preview/2018-06-01-preview/apimapiversionsets.json
   - Microsoft.ApiManagement/preview/2018-06-01-preview/definitions.json
+
+```
+
+### Tag: schema-apimanagement-2018-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2018-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ApiManagement/stable/2018-01-01/apimanagement.json
   - Microsoft.ApiManagement/stable/2018-01-01/apimapis.json
   - Microsoft.ApiManagement/stable/2018-01-01/apimauthorizationservers.json
@@ -172,6 +226,16 @@ input-file:
   - Microsoft.ApiManagement/stable/2018-01-01/apimtenant.json
   - Microsoft.ApiManagement/stable/2018-01-01/apimusers.json
   - Microsoft.ApiManagement/stable/2018-01-01/apimversionsets.json
+
+```
+
+### Tag: schema-apimanagement-2017-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2017-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ApiManagement/stable/2017-03-01/apimanagement.json
   - Microsoft.ApiManagement/stable/2017-03-01/apimapis.json
   - Microsoft.ApiManagement/stable/2017-03-01/apimauthorizationservers.json
@@ -197,6 +261,16 @@ input-file:
   - Microsoft.ApiManagement/stable/2017-03-01/apimtenant.json
   - Microsoft.ApiManagement/stable/2017-03-01/apimusers.json
   - Microsoft.ApiManagement/stable/2017-03-01/apimversionsets.json
+
+```
+
+### Tag: schema-apimanagement-2016-10-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2016-10-10' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ApiManagement/stable/2016-10-10/apimanagement.json
   - Microsoft.ApiManagement/stable/2016-10-10/apimapis.json
   - Microsoft.ApiManagement/stable/2016-10-10/apimauthorizationservers.json
@@ -215,7 +289,17 @@ input-file:
   - Microsoft.ApiManagement/stable/2016-10-10/apimsubscriptions.json
   - Microsoft.ApiManagement/stable/2016-10-10/apimtenant.json
   - Microsoft.ApiManagement/stable/2016-10-10/apimusers.json
+
+```
+
+### Tag: schema-apimanagement-2016-07-07 and azureresourceschema
+
+``` yaml $(tag) == 'schema-apimanagement-2016-07-07' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ApiManagement/stable/2016-07-07/apimanagement.json
   - Microsoft.ApiManagement/stable/2016-07-07/apimdeployment.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/appconfiguration/resource-manager/readme.azureresourceschema.md b/specification/appconfiguration/resource-manager/readme.azureresourceschema.md
index ba2dc3bec58d..8c628ac435fb 100644
--- a/specification/appconfiguration/resource-manager/readme.azureresourceschema.md
+++ b/specification/appconfiguration/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-appconfiguration-2020-06-01
+  - tag: schema-appconfiguration-2019-11-01-preview
+  - tag: schema-appconfiguration-2019-10-01
+  - tag: schema-appconfiguration-2019-02-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-appconfiguration-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-appconfiguration-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AppConfiguration/stable/2020-06-01/appconfiguration.json
+
+```
+
+### Tag: schema-appconfiguration-2019-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-appconfiguration-2019-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AppConfiguration/preview/2019-11-01-preview/appconfiguration.json
-  - Microsoft.AppConfiguration/preview/2019-02-01-preview/appconfiguration.json
+
+```
+
+### Tag: schema-appconfiguration-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-appconfiguration-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AppConfiguration/stable/2019-10-01/appconfiguration.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-appconfiguration-2019-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-appconfiguration-2019-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.AppConfiguration/preview/2019-02-01-preview/appconfiguration.json
+
+```
diff --git a/specification/applicationinsights/resource-manager/readme.azureresourceschema.md b/specification/applicationinsights/resource-manager/readme.azureresourceschema.md
index 478244a4d29a..12a53d8275a8 100644
--- a/specification/applicationinsights/resource-manager/readme.azureresourceschema.md
+++ b/specification/applicationinsights/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,131 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-insights-2020-06-02-preview
+  - tag: schema-insights-2020-03-01-preview
+  - tag: schema-insights-2020-02-10-preview
+  - tag: schema-insights-2020-02-02-preview
+  - tag: schema-insights-2019-10-17-preview
+  - tag: schema-insights-2019-09-01-preview
+  - tag: schema-insights-2018-06-17-preview
+  - tag: schema-insights-2018-05-01-preview
+  - tag: schema-insights-2017-10-01
+  - tag: schema-insights-2015-05-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-insights-2020-06-02-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2020-06-02-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json
+
+```
+
+### Tag: schema-insights-2020-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2020-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
+
+```
+
+### Tag: schema-insights-2020-02-10-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2020-02-10-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2020-02-10-preview/WebTestResults_API.json
+
+```
+
+### Tag: schema-insights-2020-02-02-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2020-02-02-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2020-02-02-preview/components_API.json
+
+```
+
+### Tag: schema-insights-2019-10-17-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2019-10-17-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2019-10-17-preview/workbookTemplates_API.json
+
+```
+
+### Tag: schema-insights-2019-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2019-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2019-09-01-preview/QueryPackQueries_API.json
+  - Microsoft.Insights/preview/2019-09-01-preview/QueryPacks_API.json
+
+```
+
+### Tag: schema-insights-2018-06-17-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-06-17-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
+
+```
+
+### Tag: schema-insights-2018-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2018-05-01-preview/components_API.json
+  - Microsoft.Insights/preview/2018-05-01-preview/componentProactiveDetection_API.json
+
+```
+
+### Tag: schema-insights-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2017-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2017-10-01/eaSubscriptionMigration_API.json
+  - Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
+
+```
+
+### Tag: schema-insights-2015-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2015-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
   - Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
   - Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
@@ -26,17 +143,6 @@ input-file:
   - Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
   - Microsoft.Insights/stable/2015-05-01/workbooks_API.json
   - Microsoft.Insights/stable/2015-05-01/myworkbooks_API.json
-  - Microsoft.Insights/preview/2018-05-01-preview/components_API.json
-  - Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
-  - Microsoft.Insights/preview/2020-02-10-preview/WebTestResults_API.json
   - Microsoft.Insights/stable/2015-05-01/components_API.json
-  - Microsoft.Insights/preview/2017-10-01/eaSubscriptionMigration_API.json
-  - Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
-  - Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
-  - Microsoft.Insights/preview/2019-10-17-preview/workbookTemplates_API.json
-  - Microsoft.Insights/preview/2018-05-01-preview/componentProactiveDetection_API.json
-  - Microsoft.Insights/preview/2019-09-01-preview/QueryPackQueries_API.json
-  - Microsoft.Insights/preview/2019-09-01-preview/QueryPacks_API.json
-  - Microsoft.Insights/preview/2020-02-02-preview/components_API.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/appplatform/resource-manager/readme.azureresourceschema.md b/specification/appplatform/resource-manager/readme.azureresourceschema.md
index 7c46a8cb2820..7c633bc07810 100644
--- a/specification/appplatform/resource-manager/readme.azureresourceschema.md
+++ b/specification/appplatform/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-appplatform-2020-07-01
+  - tag: schema-appplatform-2019-05-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-appplatform-2020-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-appplatform-2020-07-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AppPlatform/stable/2020-07-01/appplatform.json
+
+```
+
+### Tag: schema-appplatform-2019-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-appplatform-2019-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/attestation/resource-manager/readme.azureresourceschema.md b/specification/attestation/resource-manager/readme.azureresourceschema.md
index 03a1ae00b32d..990f22190468 100644
--- a/specification/attestation/resource-manager/readme.azureresourceschema.md
+++ b/specification/attestation/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-attestation-2018-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-attestation-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-attestation-2018-09-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Attestation/preview/2018-09-01-preview/attestation.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/authorization/resource-manager/readme.azureresourceschema.md b/specification/authorization/resource-manager/readme.azureresourceschema.md
index 19981f64255f..de63c8f3bf21 100644
--- a/specification/authorization/resource-manager/readme.azureresourceschema.md
+++ b/specification/authorization/resource-manager/readme.azureresourceschema.md
@@ -5,25 +5,98 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-authorization-2020-04-01-preview
+  - tag: schema-authorization-2018-09-01-preview
+  - tag: schema-authorization-2018-07-01-preview
+  - tag: schema-authorization-2018-01-01-preview
+  - tag: schema-authorization-2017-10-01-preview
+  - tag: schema-authorization-2015-07-01
+  - tag: schema-authorization-2015-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-authorization-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2020-04-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
+
+```
+
+### Tag: schema-authorization-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2018-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Authorization/preview/2018-09-01-preview/authorization-RoleAssignmentsCalls.json
+
+```
+
+### Tag: schema-authorization-2018-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2018-07-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
+
+```
+
+### Tag: schema-authorization-2018-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2018-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
+  - Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json
+  - Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
+
+```
+
+### Tag: schema-authorization-2017-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2017-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Authorization/preview/2017-10-01-preview/authorization-RoleAssignmentsCalls.json
+
+```
+
+### Tag: schema-authorization-2015-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2015-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2015-07-01/authorization-RoleDefinitionsCalls.json
   - Microsoft.Authorization/stable/2015-07-01/authorization-ProviderOperationsCalls.json
   - Microsoft.Authorization/stable/2015-07-01/authorization-ElevateAccessCalls.json
   - Microsoft.Authorization/stable/2015-07-01/authorization-RoleAssignmentsCalls.json
   - Microsoft.Authorization/stable/2015-07-01/authorization-ClassicAdminCalls.json
+
+```
+
+### Tag: schema-authorization-2015-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2015-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json
-  - Microsoft.Authorization/preview/2017-10-01-preview/authorization-RoleAssignmentsCalls.json
-  - Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
-  - Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json
-  - Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
-  - Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
-  - Microsoft.Authorization/preview/2018-09-01-preview/authorization-RoleAssignmentsCalls.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/automanage/resource-manager/readme.azureresourceschema.md b/specification/automanage/resource-manager/readme.azureresourceschema.md
index 12cf636a41cc..4a51ecd85b66 100644
--- a/specification/automanage/resource-manager/readme.azureresourceschema.md
+++ b/specification/automanage/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-automanage-2020-06-30-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-automanage-2020-06-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-automanage-2020-06-30-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Automanage/preview/2020-06-30-preview/automanage.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/automation/resource-manager/readme.azureresourceschema.md b/specification/automation/resource-manager/readme.azureresourceschema.md
index a14f67a92d64..b70f177b4995 100644
--- a/specification/automation/resource-manager/readme.azureresourceschema.md
+++ b/specification/automation/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,78 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-automation-2020-01-13-preview
+  - tag: schema-automation-2018-06-30
+  - tag: schema-automation-2018-01-15
+  - tag: schema-automation-2017-05-15-preview
+  - tag: schema-automation-2015-10-31
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-automation-2020-01-13-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-automation-2020-01-13-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Automation/preview/2020-01-13-preview/privateEndpointConnection.json
+  - Microsoft.Automation/preview/2020-01-13-preview/privateLinkResources.json
+
+```
+
+### Tag: schema-automation-2018-06-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-automation-2018-06-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Automation/stable/2018-06-30/runbook.json
+  - Microsoft.Automation/stable/2018-06-30/python2package.json
+
+```
+
+### Tag: schema-automation-2018-01-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-automation-2018-01-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Automation/stable/2018-01-15/dscNode.json
+  - Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json
+  - Microsoft.Automation/stable/2018-01-15/dscNodeConfiguration.json
+  - Microsoft.Automation/stable/2018-01-15/dscNodeCounts.json
+
+```
+
+### Tag: schema-automation-2017-05-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-automation-2017-05-15-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json
+  - Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfigurationRun.json
+  - Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfigurationMachineRun.json
+  - Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json
+  - Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json
+  - Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json
+  - Microsoft.Automation/preview/2017-05-15-preview/job.json
+
+```
+
+### Tag: schema-automation-2015-10-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-automation-2015-10-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Automation/stable/2015-10-31/account.json
   - Microsoft.Automation/stable/2015-10-31/certificate.json
@@ -30,21 +96,6 @@ input-file:
   - Microsoft.Automation/stable/2015-10-31/schedule.json
   - Microsoft.Automation/stable/2015-10-31/variable.json
   - Microsoft.Automation/stable/2015-10-31/webhook.json
-  - Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json
-  - Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfigurationRun.json
-  - Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfigurationMachineRun.json
-  - Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json
-  - Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json
-  - Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json
-  - Microsoft.Automation/preview/2017-05-15-preview/job.json
   - Microsoft.Automation/stable/2015-10-31/watcher.json
-  - Microsoft.Automation/stable/2018-01-15/dscNode.json
-  - Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json
-  - Microsoft.Automation/stable/2018-01-15/dscNodeConfiguration.json
-  - Microsoft.Automation/stable/2018-01-15/dscNodeCounts.json
-  - Microsoft.Automation/stable/2018-06-30/runbook.json
-  - Microsoft.Automation/stable/2018-06-30/python2package.json
-  - Microsoft.Automation/preview/2020-01-13-preview/privateEndpointConnection.json
-  - Microsoft.Automation/preview/2020-01-13-preview/privateLinkResources.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/azure-kusto/resource-manager/readme.azureresourceschema.md b/specification/azure-kusto/resource-manager/readme.azureresourceschema.md
index 29570cf345b0..96c34a3fb116 100644
--- a/specification/azure-kusto/resource-manager/readme.azureresourceschema.md
+++ b/specification/azure-kusto/resource-manager/readme.azureresourceschema.md
@@ -5,20 +5,92 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-kusto-2020-06-14
+  - tag: schema-kusto-2020-02-15
+  - tag: schema-kusto-2019-11-09
+  - tag: schema-kusto-2019-09-07
+  - tag: schema-kusto-2019-05-15
+  - tag: schema-kusto-2019-01-21
+  - tag: schema-kusto-2018-09-07-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-kusto-2020-06-14 and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2020-06-14' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Kusto/stable/2020-06-14/kusto.json
+
+```
+
+### Tag: schema-kusto-2020-02-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2020-02-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Kusto/stable/2020-02-15/kusto.json
+
+```
+
+### Tag: schema-kusto-2019-11-09 and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2019-11-09' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Kusto/stable/2019-11-09/kusto.json
+
+```
+
+### Tag: schema-kusto-2019-09-07 and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2019-09-07' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Kusto/stable/2019-09-07/kusto.json
+
+```
+
+### Tag: schema-kusto-2019-05-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2019-05-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Kusto/stable/2019-05-15/kusto.json
+
+```
+
+### Tag: schema-kusto-2019-01-21 and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2019-01-21' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Kusto/stable/2019-01-21/kusto.json
+
+```
+
+### Tag: schema-kusto-2018-09-07-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-kusto-2018-09-07-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Kusto/preview/2018-09-07-preview/kusto.json
-  - Microsoft.Kusto/preview/2017-09-07-privatepreview/kusto.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/azureactivedirectory/resource-manager/readme.azureresourceschema.md b/specification/azureactivedirectory/resource-manager/readme.azureresourceschema.md
index 74efe304a9b8..b6bab336b329 100644
--- a/specification/azureactivedirectory/resource-manager/readme.azureresourceschema.md
+++ b/specification/azureactivedirectory/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,45 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-aadiam-2020-07-01-preview
+  - tag: schema-aadiam-2020-03-01-preview
+  - tag: schema-aadiam-2017-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-aadiam-2020-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-aadiam-2020-07-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json
+
+```
+
+### Tag: schema-aadiam-2020-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-aadiam-2020-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json
   - Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json
+
+```
+
+### Tag: schema-aadiam-2017-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-aadiam-2017-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Aadiam/stable/2017-04-01/azureactivedirectory.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/azuredata/resource-manager/readme.azureresourceschema.md b/specification/azuredata/resource-manager/readme.azureresourceschema.md
index 599160458131..9e9e3a071f7d 100644
--- a/specification/azuredata/resource-manager/readme.azureresourceschema.md
+++ b/specification/azuredata/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-azuredata-2019-07-24-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-azuredata-2019-07-24-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-azuredata-2019-07-24-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AzureData/preview/2019-07-24-preview/azuredata.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/azurestack/resource-manager/readme.azureresourceschema.md b/specification/azurestack/resource-manager/readme.azureresourceschema.md
index e5ae259b053b..1216d57dd7c8 100644
--- a/specification/azurestack/resource-manager/readme.azureresourceschema.md
+++ b/specification/azurestack/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,23 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-azurestack-2017-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-azurestack-2017-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-azurestack-2017-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AzureStack/stable/2017-06-01/AzureStack.json
   - Microsoft.AzureStack/stable/2017-06-01/Product.json
   - Microsoft.AzureStack/stable/2017-06-01/Registration.json
   - Microsoft.AzureStack/stable/2017-06-01/CustomerSubscription.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/azurestackhci/resource-manager/readme.azureresourceschema.md b/specification/azurestackhci/resource-manager/readme.azureresourceschema.md
index b9fca452d4ef..2525a859d162 100644
--- a/specification/azurestackhci/resource-manager/readme.azureresourceschema.md
+++ b/specification/azurestackhci/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-azurestackhci-2020-03-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-azurestackhci-2020-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-azurestackhci-2020-03-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AzureStackHCI/preview/2020-03-01-preview/azurestackhci.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/batch/resource-manager/readme.azureresourceschema.md b/specification/batch/resource-manager/readme.azureresourceschema.md
index 12d667d80ce9..1bfc3c15500f 100644
--- a/specification/batch/resource-manager/readme.azureresourceschema.md
+++ b/specification/batch/resource-manager/readme.azureresourceschema.md
@@ -5,21 +5,116 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-batch-2020-05-01
+  - tag: schema-batch-2020-03-01
+  - tag: schema-batch-2019-08-01
+  - tag: schema-batch-2019-04-01
+  - tag: schema-batch-2018-12-01
+  - tag: schema-batch-2017-09-01
+  - tag: schema-batch-2017-05-01
+  - tag: schema-batch-2017-01-01
+  - tag: schema-batch-2015-12-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-batch-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2020-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Batch/stable/2020-05-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2020-03-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2019-08-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2019-04-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2018-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2018-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2018-12-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2017-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2017-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2017-09-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2017-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2017-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2017-05-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2017-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2017-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2017-01-01/BatchManagement.json
+
+```
+
+### Tag: schema-batch-2015-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batch-2015-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Batch/stable/2015-12-01/BatchManagement.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/batchai/resource-manager/readme.azureresourceschema.md b/specification/batchai/resource-manager/readme.azureresourceschema.md
index 32dd96a3901f..da50d317d24b 100644
--- a/specification/batchai/resource-manager/readme.azureresourceschema.md
+++ b/specification/batchai/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-batchai-2018-05-01
+  - tag: schema-batchai-2018-03-01
+  - tag: schema-batchai-2017-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-batchai-2018-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batchai-2018-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.BatchAI/preview/2017-09-01-preview/BatchAI.json
-  - Microsoft.BatchAI/stable/2018-03-01/BatchAI.json
   - Microsoft.BatchAI/stable/2018-05-01/BatchAI.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-batchai-2018-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-batchai-2018-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.BatchAI/stable/2018-03-01/BatchAI.json
+
+```
+
+### Tag: schema-batchai-2017-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-batchai-2017-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.BatchAI/preview/2017-09-01-preview/BatchAI.json
+
+```
diff --git a/specification/billing/resource-manager/readme.azureresourceschema.md b/specification/billing/resource-manager/readme.azureresourceschema.md
index 290d31c4a322..e7e163b7b60e 100644
--- a/specification/billing/resource-manager/readme.azureresourceschema.md
+++ b/specification/billing/resource-manager/readme.azureresourceschema.md
@@ -5,19 +5,81 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-billing-2020-05-01
+  - tag: schema-billing-2019-10-01-preview
+  - tag: schema-billing-2018-11-01-preview
+  - tag: schema-billing-2018-03-01-preview
+  - tag: schema-billing-2017-04-24-preview
+  - tag: schema-billing-2017-02-27-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-billing-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-billing-2020-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Billing/stable/2020-05-01/billing.json
-  - Microsoft.Billing/preview/2018-03-01-preview/billingV2.json
+
+```
+
+### Tag: schema-billing-2019-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-billing-2019-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Billing/preview/2019-10-01-preview/billing.json
+
+```
+
+### Tag: schema-billing-2018-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-billing-2018-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Billing/preview/2018-11-01-preview/billing.json
+
+```
+
+### Tag: schema-billing-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-billing-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Billing/preview/2018-03-01-preview/billingV2.json
   - Microsoft.Billing/preview/2018-03-01-preview/billing.json
+
+```
+
+### Tag: schema-billing-2017-04-24-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-billing-2017-04-24-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Billing/preview/2017-04-24-preview/billing.json
+
+```
+
+### Tag: schema-billing-2017-02-27-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-billing-2017-02-27-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Billing/preview/2017-02-27-preview/billing.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/blockchain/resource-manager/readme.azureresourceschema.md b/specification/blockchain/resource-manager/readme.azureresourceschema.md
index 7c2fbc9fb86d..01c28ae04c95 100644
--- a/specification/blockchain/resource-manager/readme.azureresourceschema.md
+++ b/specification/blockchain/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-blockchain-2018-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-blockchain-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-blockchain-2018-06-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Blockchain/preview/2018-06-01-preview/blockchain.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/blueprint/resource-manager/readme.azureresourceschema.md b/specification/blueprint/resource-manager/readme.azureresourceschema.md
index a485a242329c..4e9a1ed8e02a 100644
--- a/specification/blueprint/resource-manager/readme.azureresourceschema.md
+++ b/specification/blueprint/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,35 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-blueprint-2018-11-01-preview
+  - tag: schema-blueprint-2017-11-11-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-blueprint-2018-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-blueprint-2018-11-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.Blueprint/preview/2017-11-11-preview/blueprintDefinition.json
-  - Microsoft.Blueprint/preview/2017-11-11-preview/blueprintAssignment.json
   - Microsoft.Blueprint/preview/2018-11-01-preview/blueprintDefinition.json
   - Microsoft.Blueprint/preview/2018-11-01-preview/blueprintAssignment.json
   - Microsoft.Blueprint/preview/2018-11-01-preview/assignmentOperation.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-blueprint-2017-11-11-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-blueprint-2017-11-11-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Blueprint/preview/2017-11-11-preview/blueprintDefinition.json
+  - Microsoft.Blueprint/preview/2017-11-11-preview/blueprintAssignment.json
+
+```
diff --git a/specification/botservice/resource-manager/readme.azureresourceschema.md b/specification/botservice/resource-manager/readme.azureresourceschema.md
index 1c42d98efe3c..3e03a113a69a 100644
--- a/specification/botservice/resource-manager/readme.azureresourceschema.md
+++ b/specification/botservice/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-botservice-2020-06-02
+  - tag: schema-botservice-2018-07-12
+  - tag: schema-botservice-2017-12-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-botservice-2020-06-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-botservice-2020-06-02' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.BotService/stable/2020-06-02/botservice.json
+
+```
+
+### Tag: schema-botservice-2018-07-12 and azureresourceschema
+
+``` yaml $(tag) == 'schema-botservice-2018-07-12' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.BotService/preview/2018-07-12/botservice.json
+
+```
+
+### Tag: schema-botservice-2017-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-botservice-2017-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.BotService/preview/2017-12-01/botservice.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/cdn/resource-manager/readme.azureresourceschema.md b/specification/cdn/resource-manager/readme.azureresourceschema.md
index 1d475d2e8941..b4b719cb1979 100644
--- a/specification/cdn/resource-manager/readme.azureresourceschema.md
+++ b/specification/cdn/resource-manager/readme.azureresourceschema.md
@@ -5,25 +5,131 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-cdn-2020-04-15
+  - tag: schema-cdn-2019-12-31
+  - tag: schema-cdn-2019-06-15-preview
+  - tag: schema-cdn-2019-06-15
+  - tag: schema-cdn-2019-04-15
+  - tag: schema-cdn-2017-10-12
+  - tag: schema-cdn-2017-04-02
+  - tag: schema-cdn-2016-10-02
+  - tag: schema-cdn-2016-04-02
+  - tag: schema-cdn-2015-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-cdn-2020-04-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2020-04-15' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Cdn/stable/2020-04-15/cdn.json
   - Microsoft.Cdn/stable/2020-04-15/cdnwebapplicationfirewall.json
+
+```
+
+### Tag: schema-cdn-2019-12-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2019-12-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2019-12-31/cdn.json
-  - Microsoft.Cdn/stable/2019-06-15/cdn.json
-  - Microsoft.Cdn/stable/2019-06-15/cdnwebapplicationfirewall.json
+
+```
+
+### Tag: schema-cdn-2019-06-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2019-06-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/preview/2019-06-15-preview/cdn.json
   - Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json
+
+```
+
+### Tag: schema-cdn-2019-06-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2019-06-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Cdn/stable/2019-06-15/cdn.json
+  - Microsoft.Cdn/stable/2019-06-15/cdnwebapplicationfirewall.json
+
+```
+
+### Tag: schema-cdn-2019-04-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2019-04-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2019-04-15/cdn.json
+
+```
+
+### Tag: schema-cdn-2017-10-12 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2017-10-12' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2017-10-12/cdn.json
+
+```
+
+### Tag: schema-cdn-2017-04-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2017-04-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2017-04-02/cdn.json
+
+```
+
+### Tag: schema-cdn-2016-10-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2016-10-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2016-10-02/cdn.json
+
+```
+
+### Tag: schema-cdn-2016-04-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2016-04-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2016-04-02/cdn.json
+
+```
+
+### Tag: schema-cdn-2015-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cdn-2015-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cdn/stable/2015-06-01/cdn.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/changeanalysis/resource-manager/readme.azureresourceschema.md b/specification/changeanalysis/resource-manager/readme.azureresourceschema.md
index 5d0b80670299..1ff06754928a 100644
--- a/specification/changeanalysis/resource-manager/readme.azureresourceschema.md
+++ b/specification/changeanalysis/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-changeanalysis-2020-04-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-changeanalysis-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-changeanalysis-2020-04-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ChangeAnalysis/preview/2020-04-01-preview/changeanalysis.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/cloudshell/resource-manager/readme.azureresourceschema.md b/specification/cloudshell/resource-manager/readme.azureresourceschema.md
index 6df793320bc5..6f76c466351e 100644
--- a/specification/cloudshell/resource-manager/readme.azureresourceschema.md
+++ b/specification/cloudshell/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-portal-2018-10-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-portal-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-portal-2018-10-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Portal/stable/2018-10-01/CloudShell.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/cognitiveservices/resource-manager/readme.azureresourceschema.md b/specification/cognitiveservices/resource-manager/readme.azureresourceschema.md
index 71a4cea687d0..b39fda607747 100644
--- a/specification/cognitiveservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/cognitiveservices/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-cognitiveservices-2017-04-18
+  - tag: schema-cognitiveservices-2016-02-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-cognitiveservices-2017-04-18 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cognitiveservices-2017-04-18' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.CognitiveServices/stable/2017-04-18/cognitiveservices.json
+
+```
+
+### Tag: schema-cognitiveservices-2016-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-cognitiveservices-2016-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CognitiveServices/preview/2016-02-01-preview/cognitiveservices.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/commerce/resource-manager/readme.azureresourceschema.md b/specification/commerce/resource-manager/readme.azureresourceschema.md
index 98712f4d416a..10ddf94097fb 100644
--- a/specification/commerce/resource-manager/readme.azureresourceschema.md
+++ b/specification/commerce/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-commerce-2015-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-commerce-2015-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-commerce-2015-06-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/compute/resource-manager/readme.azureresourceschema.md b/specification/compute/resource-manager/readme.azureresourceschema.md
index 9a4c180090b4..fe54530ede0c 100644
--- a/specification/compute/resource-manager/readme.azureresourceschema.md
+++ b/specification/compute/resource-manager/readme.azureresourceschema.md
@@ -5,53 +5,291 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-containerservice-2017-01-31
+  - tag: schema-containerservice-2016-09-30
+  - tag: schema-containerservice-2016-03-30
+  - tag: schema-containerservice-2015-11-01-preview
+  - tag: schema-compute-2020-06-30
+  - tag: schema-compute-2020-06-01
+  - tag: schema-compute-2020-05-01
+  - tag: schema-compute-2019-12-01
+  - tag: schema-compute-2019-11-01
+  - tag: schema-compute-2019-07-01
+  - tag: schema-compute-2019-04-01
+  - tag: schema-compute-2019-03-01
+  - tag: schema-compute-2018-10-01
+  - tag: schema-compute-2018-09-30
+  - tag: schema-compute-2018-06-01
+  - tag: schema-compute-2018-04-01
+  - tag: schema-compute-2017-12-01
+  - tag: schema-compute-2017-09-01
+  - tag: schema-compute-2017-03-30
+  - tag: schema-compute-2016-04-30-preview
+  - tag: schema-compute-2016-03-30
+  - tag: schema-compute-2015-06-15
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-containerservice-2017-01-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2017-01-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2017-01-31/containerService.json
+
+```
+
+### Tag: schema-containerservice-2016-09-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2016-09-30' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2016-09-30/containerService.json
+
+```
+
+### Tag: schema-containerservice-2016-03-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2016-03-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2016-03-30/containerService.json
+
+```
+
+### Tag: schema-containerservice-2015-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2015-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/preview/2015-11-01-preview/containerService.json
+
+```
+
+### Tag: schema-compute-2020-06-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2020-06-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Compute/stable/2020-06-30/disk.json
+
+```
+
+### Tag: schema-compute-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2020-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Compute/stable/2020-06-01/compute.json
   - Microsoft.Compute/stable/2020-06-01/runCommands.json
-  - Microsoft.Compute/stable/2019-04-01/skus.json
-  - Microsoft.Compute/stable/2020-06-30/disk.json
-  - Microsoft.Compute/stable/2019-12-01/gallery.json
-  - Microsoft.ContainerService/stable/2017-01-31/containerService.json
+
+```
+
+### Tag: schema-compute-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2020-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2020-05-01/disk.json
+
+```
+
+### Tag: schema-compute-2019-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2019-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Compute/stable/2019-12-01/gallery.json
   - Microsoft.Compute/stable/2019-12-01/compute.json
   - Microsoft.Compute/stable/2019-12-01/runCommands.json
+
+```
+
+### Tag: schema-compute-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2019-11-01/disk.json
+
+```
+
+### Tag: schema-compute-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2019-07-01/compute.json
   - Microsoft.Compute/stable/2019-07-01/runCommands.json
   - Microsoft.Compute/stable/2019-07-01/gallery.json
   - Microsoft.Compute/stable/2019-07-01/disk.json
+
+```
+
+### Tag: schema-compute-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Compute/stable/2019-04-01/skus.json
+
+```
+
+### Tag: schema-compute-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2019-03-01/compute.json
   - Microsoft.Compute/stable/2019-03-01/runCommands.json
   - Microsoft.Compute/stable/2019-03-01/disk.json
   - Microsoft.Compute/stable/2019-03-01/gallery.json
+
+```
+
+### Tag: schema-compute-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2018-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2018-10-01/compute.json
   - Microsoft.Compute/stable/2018-10-01/runCommands.json
-  - Microsoft.Compute/stable/2017-09-01/skus.json
+
+```
+
+### Tag: schema-compute-2018-09-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2018-09-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2018-09-30/disk.json
+
+```
+
+### Tag: schema-compute-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2018-06-01/gallery.json
   - Microsoft.Compute/stable/2018-06-01/disk.json
   - Microsoft.Compute/stable/2018-06-01/compute.json
   - Microsoft.Compute/stable/2018-06-01/runCommands.json
+
+```
+
+### Tag: schema-compute-2018-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2018-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2018-04-01/compute.json
   - Microsoft.Compute/stable/2018-04-01/runCommands.json
   - Microsoft.Compute/stable/2018-04-01/disk.json
+
+```
+
+### Tag: schema-compute-2017-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2017-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2017-12-01/compute.json
   - Microsoft.Compute/stable/2017-12-01/runCommands.json
+
+```
+
+### Tag: schema-compute-2017-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2017-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Compute/stable/2017-09-01/skus.json
+
+```
+
+### Tag: schema-compute-2017-03-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2017-03-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2017-03-30/disk.json
   - Microsoft.Compute/stable/2017-03-30/compute.json
   - Microsoft.Compute/stable/2017-03-30/runCommands.json
-  - Microsoft.ContainerService/stable/2016-09-30/containerService.json
+
+```
+
+### Tag: schema-compute-2016-04-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2016-04-30-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/preview/2016-04-30-preview/compute.json
   - Microsoft.Compute/preview/2016-04-30-preview/disk.json
+
+```
+
+### Tag: schema-compute-2016-03-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2016-03-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2016-03-30/compute.json
-  - Microsoft.ContainerService/stable/2016-03-30/containerService.json
-  - Microsoft.ContainerService/preview/2015-11-01-preview/containerService.json
+
+```
+
+### Tag: schema-compute-2015-06-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-compute-2015-06-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Compute/stable/2015-06-15/compute.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/consumption/resource-manager/readme.azureresourceschema.md b/specification/consumption/resource-manager/readme.azureresourceschema.md
index c78316cad82f..cdf86806a081 100644
--- a/specification/consumption/resource-manager/readme.azureresourceschema.md
+++ b/specification/consumption/resource-manager/readme.azureresourceschema.md
@@ -5,28 +5,200 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-consumption-2019-10-01
+  - tag: schema-consumption-2019-06-01
+  - tag: schema-consumption-2019-05-01-preview
+  - tag: schema-consumption-2019-05-01
+  - tag: schema-consumption-2019-04-01-preview
+  - tag: schema-consumption-2019-01-01
+  - tag: schema-consumption-2018-11-01-preview
+  - tag: schema-consumption-2018-10-01
+  - tag: schema-consumption-2018-08-31
+  - tag: schema-consumption-2018-06-30
+  - tag: schema-consumption-2018-05-31
+  - tag: schema-consumption-2018-03-31
+  - tag: schema-consumption-2018-01-31
+  - tag: schema-consumption-2017-12-30-preview
+  - tag: schema-consumption-2017-11-30
+  - tag: schema-consumption-2017-04-24-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-consumption-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2019-10-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Consumption/stable/2019-10-01/consumption.json
+
+```
+
+### Tag: schema-consumption-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Consumption/stable/2019-06-01/consumption.json
-  - Microsoft.Consumption/stable/2019-05-01/consumption.json
+
+```
+
+### Tag: schema-consumption-2019-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2019-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Consumption/preview/2019-05-01-preview/consumption.json
+
+```
+
+### Tag: schema-consumption-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2019-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2019-05-01/consumption.json
+
+```
+
+### Tag: schema-consumption-2019-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2019-04-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Consumption/preview/2019-04-01-preview/consumption.json
-  - Microsoft.Consumption/preview/2018-11-01-preview/consumption.json
+
+```
+
+### Tag: schema-consumption-2019-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2019-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Consumption/stable/2019-01-01/consumption.json
-  - Microsoft.Consumption/stable/2017-11-30/consumption.json
-  - Microsoft.Consumption/stable/2018-01-31/consumption.json
-  - Microsoft.Consumption/stable/2018-03-31/consumption.json
-  - Microsoft.Consumption/stable/2018-05-31/consumption.json
-  - Microsoft.Consumption/stable/2018-06-30/consumption.json
-  - Microsoft.Consumption/stable/2018-08-31/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/preview/2018-11-01-preview/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Consumption/stable/2018-10-01/consumption.json
-  - Microsoft.Consumption/preview/2017-04-24-preview/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-08-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-08-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2018-08-31/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-06-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-06-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2018-06-30/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-05-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-05-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2018-05-31/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-03-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-03-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2018-03-31/consumption.json
+
+```
+
+### Tag: schema-consumption-2018-01-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2018-01-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2018-01-31/consumption.json
+
+```
+
+### Tag: schema-consumption-2017-12-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2017-12-30-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Consumption/preview/2017-12-30-preview/consumption.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-consumption-2017-11-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2017-11-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/stable/2017-11-30/consumption.json
+
+```
+
+### Tag: schema-consumption-2017-04-24-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-consumption-2017-04-24-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Consumption/preview/2017-04-24-preview/consumption.json
+
+```
diff --git a/specification/containerinstance/resource-manager/readme.azureresourceschema.md b/specification/containerinstance/resource-manager/readme.azureresourceschema.md
index dbe8ad3c0ed9..60456759fd2a 100644
--- a/specification/containerinstance/resource-manager/readme.azureresourceschema.md
+++ b/specification/containerinstance/resource-manager/readme.azureresourceschema.md
@@ -5,21 +5,116 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-containerinstance-2019-12-01
+  - tag: schema-containerinstance-2018-10-01
+  - tag: schema-containerinstance-2018-09-01
+  - tag: schema-containerinstance-2018-06-01
+  - tag: schema-containerinstance-2018-04-01
+  - tag: schema-containerinstance-2018-02-01-preview
+  - tag: schema-containerinstance-2017-12-01-preview
+  - tag: schema-containerinstance-2017-10-01-preview
+  - tag: schema-containerinstance-2017-08-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-containerinstance-2019-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2019-12-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ContainerInstance/stable/2019-12-01/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2018-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/stable/2018-10-01/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2018-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2018-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/stable/2018-09-01/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/stable/2018-06-01/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2018-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2018-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/stable/2018-04-01/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2018-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2018-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/preview/2018-02-01-preview/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2017-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2017-12-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/preview/2017-12-01-preview/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2017-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2017-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/preview/2017-10-01-preview/containerInstance.json
+
+```
+
+### Tag: schema-containerinstance-2017-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerinstance-2017-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerInstance/preview/2017-08-01-preview/containerInstance.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/containerregistry/resource-manager/readme.azureresourceschema.md b/specification/containerregistry/resource-manager/readme.azureresourceschema.md
index 6b15e2a76190..6668c2cecf11 100644
--- a/specification/containerregistry/resource-manager/readme.azureresourceschema.md
+++ b/specification/containerregistry/resource-manager/readme.azureresourceschema.md
@@ -5,23 +5,140 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-containerregistry-2019-12-01-preview
+  - tag: schema-containerregistry-2019-06-01-preview
+  - tag: schema-containerregistry-2019-05-01-preview
+  - tag: schema-containerregistry-2019-05-01
+  - tag: schema-containerregistry-2019-04-01
+  - tag: schema-containerregistry-2018-09-01
+  - tag: schema-containerregistry-2018-02-01-preview
+  - tag: schema-containerregistry-2017-10-01
+  - tag: schema-containerregistry-2017-06-01-preview
+  - tag: schema-containerregistry-2017-03-01
+  - tag: schema-containerregistry-2016-06-27-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-containerregistry-2019-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2019-12-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
+
+```
+
+### Tag: schema-containerregistry-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2019-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
+
+```
+
+### Tag: schema-containerregistry-2019-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2019-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/preview/2019-05-01-preview/containerregistry_scopemap.json
+
+```
+
+### Tag: schema-containerregistry-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2019-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json
+
+```
+
+### Tag: schema-containerregistry-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json
-  - Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
+
+```
+
+### Tag: schema-containerregistry-2018-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2018-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
+
+```
+
+### Tag: schema-containerregistry-2018-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2018-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/preview/2018-02-01-preview/containerregistry_build.json
+
+```
+
+### Tag: schema-containerregistry-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2017-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
+
+```
+
+### Tag: schema-containerregistry-2017-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2017-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/preview/2017-06-01-preview/containerregistry.json
+
+```
+
+### Tag: schema-containerregistry-2017-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2017-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/stable/2017-03-01/containerregistry.json
+
+```
+
+### Tag: schema-containerregistry-2016-06-27-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerregistry-2016-06-27-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerRegistry/preview/2016-06-27-preview/containerregistry.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/containerservice/resource-manager/readme.azureresourceschema.md b/specification/containerservice/resource-manager/readme.azureresourceschema.md
index 25f4a5b0ad4f..90ab94bce32e 100644
--- a/specification/containerservice/resource-manager/readme.azureresourceschema.md
+++ b/specification/containerservice/resource-manager/readme.azureresourceschema.md
@@ -5,39 +5,299 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-containerservice-2020-07-01
+  - tag: schema-containerservice-2020-06-01
+  - tag: schema-containerservice-2020-04-01
+  - tag: schema-containerservice-2020-03-01
+  - tag: schema-containerservice-2020-02-01
+  - tag: schema-containerservice-2020-01-01
+  - tag: schema-containerservice-2019-11-01
+  - tag: schema-containerservice-2019-10-27-preview
+  - tag: schema-containerservice-2019-10-01
+  - tag: schema-containerservice-2019-09-30
+  - tag: schema-containerservice-2019-08-01
+  - tag: schema-containerservice-2019-06-01
+  - tag: schema-containerservice-2019-04-30
+  - tag: schema-containerservice-2019-04-01
+  - tag: schema-containerservice-2019-02-01
+  - tag: schema-containerservice-2018-09-30-preview
+  - tag: schema-containerservice-2018-08-01-preview
+  - tag: schema-containerservice-2018-03-31
+  - tag: schema-containerservice-2017-09-30
+  - tag: schema-containerservice-2017-08-31
+  - tag: schema-containerservice-2017-07-01
+  - tag: schema-containerservice-2017-01-31
+  - tag: schema-containerservice-2016-09-30
+  - tag: schema-containerservice-2016-03-30
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-containerservice-2020-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2020-07-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
-  - Microsoft.ContainerService/stable/2017-07-01/containerService.json
-  - Microsoft.ContainerService/stable/2019-08-01/location.json
   - Microsoft.ContainerService/stable/2020-07-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2020-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2020-06-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2020-04-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2020-03-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2020-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2020-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2020-02-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2020-01-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2019-11-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-10-27-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-10-27-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/preview/2019-10-27-preview/openShiftManagedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2019-10-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-09-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-09-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2019-08-01/location.json
   - Microsoft.ContainerService/stable/2019-08-01/managedClusters.json
-  - Microsoft.ContainerService/stable/2019-10-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2019-06-01/location.json
   - Microsoft.ContainerService/stable/2019-06-01/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-04-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-04-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2019-04-01/managedClusters.json
   - Microsoft.ContainerService/stable/2019-04-01/location.json
-  - Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
+
+```
+
+### Tag: schema-containerservice-2019-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2019-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2019-02-01/managedClusters.json
-  - Microsoft.ContainerService/stable/2017-09-30/location.json
+
+```
+
+### Tag: schema-containerservice-2018-09-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2018-09-30-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
+
+```
+
+### Tag: schema-containerservice-2018-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2018-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/preview/2018-08-01-preview/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2018-03-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2018-03-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2018-03-31/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2017-09-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2017-09-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2017-09-30/location.json
+
+```
+
+### Tag: schema-containerservice-2017-08-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2017-08-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2017-08-31/managedClusters.json
+
+```
+
+### Tag: schema-containerservice-2017-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2017-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ContainerService/stable/2017-07-01/containerService.json
+
+```
+
+### Tag: schema-containerservice-2017-01-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2017-01-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2017-01-31/containerService.json
+
+```
+
+### Tag: schema-containerservice-2016-09-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2016-09-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2016-09-30/containerService.json
+
+```
+
+### Tag: schema-containerservice-2016-03-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-containerservice-2016-03-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ContainerService/stable/2016-03-30/containerService.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/cosmos-db/resource-manager/readme.azureresourceschema.md b/specification/cosmos-db/resource-manager/readme.azureresourceschema.md
index 78fd151f3ab1..4abf996fb40b 100644
--- a/specification/cosmos-db/resource-manager/readme.azureresourceschema.md
+++ b/specification/cosmos-db/resource-manager/readme.azureresourceschema.md
@@ -5,29 +5,146 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-documentdb-2020-06-01-preview
+  - tag: schema-documentdb-2020-04-01
+  - tag: schema-documentdb-2020-03-01
+  - tag: schema-documentdb-2019-12-12
+  - tag: schema-documentdb-2019-08-01-preview
+  - tag: schema-documentdb-2019-08-01
+  - tag: schema-documentdb-2016-03-31
+  - tag: schema-documentdb-2016-03-19
+  - tag: schema-documentdb-2015-11-06
+  - tag: schema-documentdb-2015-04-08
+  - tag: schema-documentdb-2014-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-documentdb-2020-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2020-06-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
   - Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json
-  - Microsoft.DocumentDB/preview/2019-08-01-preview/privateLinkResources.json
-  - Microsoft.DocumentDB/preview/2019-08-01-preview/privateEndpointConnection.json
+
+```
+
+### Tag: schema-documentdb-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DocumentDB/stable/2020-04-01/cosmos-db.json
   - Microsoft.DocumentDB/stable/2020-04-01/notebook.json
+
+```
+
+### Tag: schema-documentdb-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DocumentDB/stable/2020-03-01/cosmos-db.json
   - Microsoft.DocumentDB/stable/2020-03-01/notebook.json
+
+```
+
+### Tag: schema-documentdb-2019-12-12 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2019-12-12' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DocumentDB/stable/2019-12-12/cosmos-db.json
   - Microsoft.DocumentDB/stable/2019-12-12/notebook.json
+
+```
+
+### Tag: schema-documentdb-2019-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2019-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DocumentDB/preview/2019-08-01-preview/privateLinkResources.json
+  - Microsoft.DocumentDB/preview/2019-08-01-preview/privateEndpointConnection.json
+
+```
+
+### Tag: schema-documentdb-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json
   - Microsoft.DocumentDB/stable/2019-08-01/notebook.json
+
+```
+
+### Tag: schema-documentdb-2016-03-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2016-03-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json
+
+```
+
+### Tag: schema-documentdb-2016-03-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2016-03-19' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json
+
+```
+
+### Tag: schema-documentdb-2015-11-06 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2015-11-06' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json
+
+```
+
+### Tag: schema-documentdb-2015-04-08 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2015-04-08' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json
+
+```
+
+### Tag: schema-documentdb-2014-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-documentdb-2014-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DocumentDB/stable/2014-04-01/cosmos-db.json
-  - Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json
-  - Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json
-  - Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/cost-management/resource-manager/readme.azureresourceschema.md b/specification/cost-management/resource-manager/readme.azureresourceschema.md
index 10a2d9350b03..87d877890c0c 100644
--- a/specification/cost-management/resource-manager/readme.azureresourceschema.md
+++ b/specification/cost-management/resource-manager/readme.azureresourceschema.md
@@ -5,23 +5,140 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-costmanagement-2020-06-01
+  - tag: schema-costmanagement-2020-03-01-preview
+  - tag: schema-costmanagement-2019-11-01
+  - tag: schema-costmanagement-2019-10-01
+  - tag: schema-costmanagement-2019-09-01
+  - tag: schema-costmanagement-2019-04-01-preview
+  - tag: schema-costmanagement-2019-03-01-preview
+  - tag: schema-costmanagement-2019-01-01
+  - tag: schema-costmanagement-2018-12-01-preview
+  - tag: schema-costmanagement-2018-08-01-preview
+  - tag: schema-costmanagement-2018-05-31
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-costmanagement-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.CostManagement/stable/2020-06-01/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2020-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2020-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/preview/2020-03-01-preview/costallocation.json
+
+```
+
+### Tag: schema-costmanagement-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/stable/2019-11-01/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/stable/2019-10-01/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2019-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2019-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/stable/2019-09-01/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2019-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2019-04-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/preview/2019-04-01-preview/costmanagement.json
-  - Microsoft.CostManagement/stable/2019-01-01/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2019-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2019-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/preview/2019-03-01-preview/costmanagement.json
-  - Microsoft.CostManagement/stable/2018-05-31/costmanagement.json
-  - Microsoft.CostManagement/preview/2018-08-01-preview/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2019-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2019-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CostManagement/stable/2019-01-01/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2018-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2018-12-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CostManagement/preview/2018-12-01-preview/costmanagement.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-costmanagement-2018-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2018-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CostManagement/preview/2018-08-01-preview/costmanagement.json
+
+```
+
+### Tag: schema-costmanagement-2018-05-31 and azureresourceschema
+
+``` yaml $(tag) == 'schema-costmanagement-2018-05-31' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CostManagement/stable/2018-05-31/costmanagement.json
+
+```
diff --git a/specification/cpim/resource-manager/readme.azureresourceschema.md b/specification/cpim/resource-manager/readme.azureresourceschema.md
index ca6792d33153..b627d4375146 100644
--- a/specification/cpim/resource-manager/readme.azureresourceschema.md
+++ b/specification/cpim/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-azureactivedirectory-2020-05-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-azureactivedirectory-2020-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-azureactivedirectory-2020-05-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AzureActiveDirectory/preview/2020-05-01-preview/cpim.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/customer-insights/resource-manager/readme.azureresourceschema.md b/specification/customer-insights/resource-manager/readme.azureresourceschema.md
index 6f6157c82d5e..856e894fb719 100644
--- a/specification/customer-insights/resource-manager/readme.azureresourceschema.md
+++ b/specification/customer-insights/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-customerinsights-2017-04-26
+  - tag: schema-customerinsights-2017-01-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-customerinsights-2017-04-26 and azureresourceschema
+
+``` yaml $(tag) == 'schema-customerinsights-2017-04-26' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.CustomerInsights/stable/2017-04-26/customer-insights.json
+
+```
+
+### Tag: schema-customerinsights-2017-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-customerinsights-2017-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.CustomerInsights/stable/2017-01-01/customer-insights.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/customerlockbox/resource-manager/readme.azureresourceschema.md b/specification/customerlockbox/resource-manager/readme.azureresourceschema.md
index bde29489923e..c4bfaba99a75 100644
--- a/specification/customerlockbox/resource-manager/readme.azureresourceschema.md
+++ b/specification/customerlockbox/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-customerlockbox-2018-02-28-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-customerlockbox-2018-02-28-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-customerlockbox-2018-02-28-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.CustomerLockbox/preview/2018-02-28-preview/customerlockbox.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/customproviders/resource-manager/readme.azureresourceschema.md b/specification/customproviders/resource-manager/readme.azureresourceschema.md
index 9ea1050a12bf..cfe5cfcbb11e 100644
--- a/specification/customproviders/resource-manager/readme.azureresourceschema.md
+++ b/specification/customproviders/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-customproviders-2018-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-customproviders-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-customproviders-2018-09-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.CustomProviders/preview/2018-09-01-preview/customproviders.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/databox/resource-manager/readme.azureresourceschema.md b/specification/databox/resource-manager/readme.azureresourceschema.md
index 7c79aa8fc663..d96954178ec5 100644
--- a/specification/databox/resource-manager/readme.azureresourceschema.md
+++ b/specification/databox/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-databox-2020-04-01
+  - tag: schema-databox-2019-09-01
+  - tag: schema-databox-2018-01-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-databox-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databox-2020-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DataBox/stable/2020-04-01/databox.json
+
+```
+
+### Tag: schema-databox-2019-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databox-2019-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataBox/stable/2019-09-01/databox.json
+
+```
+
+### Tag: schema-databox-2018-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databox-2018-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataBox/stable/2018-01-01/databox.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/databoxedge/resource-manager/readme.azureresourceschema.md b/specification/databoxedge/resource-manager/readme.azureresourceschema.md
index d01caa036e50..12341995da0e 100644
--- a/specification/databoxedge/resource-manager/readme.azureresourceschema.md
+++ b/specification/databoxedge/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-databoxedge-2020-05-01-preview
+  - tag: schema-databoxedge-2019-08-01
+  - tag: schema-databoxedge-2019-07-01
+  - tag: schema-databoxedge-2019-03-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-databoxedge-2020-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-databoxedge-2020-05-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DataBoxEdge/preview/2020-05-01-preview/databoxedge.json
+
+```
+
+### Tag: schema-databoxedge-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databoxedge-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataBoxEdge/stable/2019-08-01/databoxedge.json
+
+```
+
+### Tag: schema-databoxedge-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databoxedge-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataBoxEdge/stable/2019-07-01/databoxedge.json
+
+```
+
+### Tag: schema-databoxedge-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databoxedge-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataBoxEdge/stable/2019-03-01/databoxedge.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/databricks/resource-manager/readme.azureresourceschema.md b/specification/databricks/resource-manager/readme.azureresourceschema.md
index 497c69effc18..d05e235cbedf 100644
--- a/specification/databricks/resource-manager/readme.azureresourceschema.md
+++ b/specification/databricks/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-databricks-2018-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-databricks-2018-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-databricks-2018-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Databricks/stable/2018-04-01/databricks.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/datacatalog/resource-manager/readme.azureresourceschema.md b/specification/datacatalog/resource-manager/readme.azureresourceschema.md
index 3c530d5aa72f..7c377f7a6300 100644
--- a/specification/datacatalog/resource-manager/readme.azureresourceschema.md
+++ b/specification/datacatalog/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-datacatalog-2016-03-30
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-datacatalog-2016-03-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-datacatalog-2016-03-30' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DataCatalog/stable/2016-03-30/datacatalog.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/datafactory/resource-manager/readme.azureresourceschema.md b/specification/datafactory/resource-manager/readme.azureresourceschema.md
index 0859d63d0e2c..d73c49adc290 100644
--- a/specification/datafactory/resource-manager/readme.azureresourceschema.md
+++ b/specification/datafactory/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-datafactory-2018-06-01
+  - tag: schema-datafactory-2017-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-datafactory-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-datafactory-2018-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DataFactory/stable/2018-06-01/datafactory.json
+
+```
+
+### Tag: schema-datafactory-2017-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datafactory-2017-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/datalake-analytics/resource-manager/readme.azureresourceschema.md b/specification/datalake-analytics/resource-manager/readme.azureresourceschema.md
index 656a3fb0d88f..ee0f54438247 100644
--- a/specification/datalake-analytics/resource-manager/readme.azureresourceschema.md
+++ b/specification/datalake-analytics/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-datalakeanalytics-2016-11-01
+  - tag: schema-datalakeanalytics-2015-10-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-datalakeanalytics-2016-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-datalakeanalytics-2016-11-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DataLakeAnalytics/stable/2016-11-01/account.json
+
+```
+
+### Tag: schema-datalakeanalytics-2015-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datalakeanalytics-2015-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataLakeAnalytics/preview/2015-10-01-preview/account.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/datalake-store/resource-manager/readme.azureresourceschema.md b/specification/datalake-store/resource-manager/readme.azureresourceschema.md
index fe734998eb05..6382fd8e0e7e 100644
--- a/specification/datalake-store/resource-manager/readme.azureresourceschema.md
+++ b/specification/datalake-store/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-datalakestore-2016-11-01
+  - tag: schema-datalakestore-2015-10-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-datalakestore-2016-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-datalakestore-2016-11-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DataLakeStore/stable/2016-11-01/account.json
+
+```
+
+### Tag: schema-datalakestore-2015-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datalakestore-2015-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataLakeStore/preview/2015-10-01-preview/account.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/datamigration/resource-manager/readme.azureresourceschema.md b/specification/datamigration/resource-manager/readme.azureresourceschema.md
index 1b3b9b0ddad8..721f822565b6 100644
--- a/specification/datamigration/resource-manager/readme.azureresourceschema.md
+++ b/specification/datamigration/resource-manager/readme.azureresourceschema.md
@@ -5,42 +5,24 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-datamigration-2018-07-15-preview
+  - tag: schema-datamigration-2018-04-19
+  - tag: schema-datamigration-2018-03-31-preview
+  - tag: schema-datamigration-2018-03-15-preview
+  - tag: schema-datamigration-2017-11-15-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-datamigration-2018-07-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datamigration-2018-07-15-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.DataMigration/stable/2018-04-19/datamigration.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/Commands.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/Common.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToSourceMySqlTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToSourcePostgreSqlSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToSourceSqlServerTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetAzureDbForMySqlTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetAzureDbForPostgreSqlSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlDbTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlMITask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlMiSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlSqlDbSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/GetTdeCertificatesSqlTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/GetUserTablesSqlSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/GetUserTablesSqlTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateMySqlAzureDbForMySqlSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigratePostgreSqlAzureDbForPostgreSqlSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlDbSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlDbTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlMITask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlMiSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/Projects.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/Services.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/Tasks.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrationValidation.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ValidateMigrationInputSqlServerSqlMITask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ValidateMigrationInputSqlServerSqlMiSyncTask.json
-  - Microsoft.DataMigration/stable/2018-04-19/definitions/ValidateSyncMigrationInputSqlServerTask.json
   - Microsoft.DataMigration/preview/2018-07-15-preview/datamigration.json
   - Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Commands.json
   - Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Common.json
@@ -76,6 +58,55 @@ input-file:
   - Microsoft.DataMigration/preview/2018-07-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json
   - Microsoft.DataMigration/preview/2018-07-15-preview/definitions/ValidateSyncMigrationInputSqlServerTask.json
   - Microsoft.DataMigration/preview/2018-07-15-preview/definitions/ValidateMigrationInputSqlServerSqlMiSyncTask.json
+
+```
+
+### Tag: schema-datamigration-2018-04-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-datamigration-2018-04-19' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DataMigration/stable/2018-04-19/datamigration.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/Commands.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/Common.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToSourceMySqlTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToSourcePostgreSqlSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToSourceSqlServerTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetAzureDbForMySqlTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetAzureDbForPostgreSqlSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlDbTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlMITask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlMiSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ConnectToTargetSqlSqlDbSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/GetTdeCertificatesSqlTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/GetUserTablesSqlSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/GetUserTablesSqlTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateMySqlAzureDbForMySqlSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigratePostgreSqlAzureDbForPostgreSqlSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlDbSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlDbTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlMITask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrateSqlServerSqlMiSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/Projects.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/Services.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/Tasks.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/MigrationValidation.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ValidateMigrationInputSqlServerSqlMITask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ValidateMigrationInputSqlServerSqlMiSyncTask.json
+  - Microsoft.DataMigration/stable/2018-04-19/definitions/ValidateSyncMigrationInputSqlServerTask.json
+
+```
+
+### Tag: schema-datamigration-2018-03-31-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datamigration-2018-03-31-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataMigration/preview/2018-03-31-preview/datamigration.json
   - Microsoft.DataMigration/preview/2018-03-31-preview/definitions/Common.json
   - Microsoft.DataMigration/preview/2018-03-31-preview/definitions/ConnectToSourceSqlServerTask.json
@@ -90,6 +121,16 @@ input-file:
   - Microsoft.DataMigration/preview/2018-03-31-preview/definitions/TasksCommon.json
   - Microsoft.DataMigration/preview/2018-03-31-preview/definitions/MigrationValidation.json
   - Microsoft.DataMigration/preview/2018-03-31-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json
+
+```
+
+### Tag: schema-datamigration-2018-03-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datamigration-2018-03-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataMigration/preview/2018-03-15-preview/datamigration.json
   - Microsoft.DataMigration/preview/2018-03-15-preview/definitions/Common.json
   - Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToSourceSqlServerTask.json
@@ -104,6 +145,16 @@ input-file:
   - Microsoft.DataMigration/preview/2018-03-15-preview/definitions/TasksCommon.json
   - Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrationValidation.json
   - Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json
+
+```
+
+### Tag: schema-datamigration-2017-11-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datamigration-2017-11-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DataMigration/preview/2017-11-15-preview/datamigration.json
   - Microsoft.DataMigration/preview/2017-11-15-preview/definitions/Common.json
   - Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToSourceSqlServerTask.json
@@ -116,4 +167,4 @@ input-file:
   - Microsoft.DataMigration/preview/2017-11-15-preview/definitions/TasksCommon.json
   - Microsoft.DataMigration/preview/2017-11-15-preview/definitions/MigrationValidation.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/datashare/resource-manager/readme.azureresourceschema.md b/specification/datashare/resource-manager/readme.azureresourceschema.md
index e2e0c21c1770..a0664f3ea80e 100644
--- a/specification/datashare/resource-manager/readme.azureresourceschema.md
+++ b/specification/datashare/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-datashare-2019-11-01
+  - tag: schema-datashare-2018-11-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-datashare-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-datashare-2019-11-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.DataShare/preview/2018-11-01-preview/DataShare.json
   - Microsoft.DataShare/stable/2019-11-01/DataShare.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-datashare-2018-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-datashare-2018-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DataShare/preview/2018-11-01-preview/DataShare.json
+
+```
diff --git a/specification/deploymentmanager/resource-manager/readme.azureresourceschema.md b/specification/deploymentmanager/resource-manager/readme.azureresourceschema.md
index 072468d802f4..2502de8815f2 100644
--- a/specification/deploymentmanager/resource-manager/readme.azureresourceschema.md
+++ b/specification/deploymentmanager/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-deploymentmanager-2019-11-01-preview
+  - tag: schema-deploymentmanager-2018-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-deploymentmanager-2019-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-deploymentmanager-2019-11-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DeploymentManager/preview/2019-11-01-preview/deploymentmanager.json
+
+```
+
+### Tag: schema-deploymentmanager-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-deploymentmanager-2018-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DeploymentManager/preview/2018-09-01-preview/deploymentmanager.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md b/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md
index f969e464a0ca..9a0a2b34dc89 100644
--- a/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md
+++ b/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-desktopvirtualization-2019-12-10-preview
+  - tag: schema-desktopvirtualization-2019-09-24-preview
+  - tag: schema-desktopvirtualization-2019-01-23-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-desktopvirtualization-2019-12-10-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-desktopvirtualization-2019-12-10-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
-  - Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
   - Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-desktopvirtualization-2019-09-24-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-desktopvirtualization-2019-09-24-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
+
+```
+
+### Tag: schema-desktopvirtualization-2019-01-23-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-desktopvirtualization-2019-01-23-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
+
+```
diff --git a/specification/deviceprovisioningservices/resource-manager/readme.azureresourceschema.md b/specification/deviceprovisioningservices/resource-manager/readme.azureresourceschema.md
index 2a52c178fe5d..6e5d5657731e 100644
--- a/specification/deviceprovisioningservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/deviceprovisioningservices/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-devices-2020-01-01
+  - tag: schema-devices-2018-01-22
+  - tag: schema-devices-2017-11-15
+  - tag: schema-devices-2017-08-21-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-devices-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.Devices/preview/2017-08-21-preview/iotdps.json
-  - Microsoft.Devices/stable/2017-11-15/iotdps.json
-  - Microsoft.Devices/stable/2018-01-22/iotdps.json
   - Microsoft.Devices/stable/2020-01-01/iotdps.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-devices-2018-01-22 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2018-01-22' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Devices/stable/2018-01-22/iotdps.json
+
+```
+
+### Tag: schema-devices-2017-11-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2017-11-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Devices/stable/2017-11-15/iotdps.json
+
+```
+
+### Tag: schema-devices-2017-08-21-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2017-08-21-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Devices/preview/2017-08-21-preview/iotdps.json
+
+```
diff --git a/specification/devops/resource-manager/readme.azureresourceschema.md b/specification/devops/resource-manager/readme.azureresourceschema.md
index 138de8afd0d1..f9ba7f8d1279 100644
--- a/specification/devops/resource-manager/readme.azureresourceschema.md
+++ b/specification/devops/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-devops-2019-07-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-devops-2019-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devops-2019-07-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DevOps/preview/2019-07-01-preview/devops.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/devspaces/resource-manager/readme.azureresourceschema.md b/specification/devspaces/resource-manager/readme.azureresourceschema.md
index e92ba995a590..30adf4995497 100644
--- a/specification/devspaces/resource-manager/readme.azureresourceschema.md
+++ b/specification/devspaces/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-devspaces-2019-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-devspaces-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devspaces-2019-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DevSpaces/stable/2019-04-01/devspaces.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/devtestlabs/resource-manager/readme.azureresourceschema.md b/specification/devtestlabs/resource-manager/readme.azureresourceschema.md
index e0dbf5a666ed..aac574024db7 100644
--- a/specification/devtestlabs/resource-manager/readme.azureresourceschema.md
+++ b/specification/devtestlabs/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-devtestlab-2018-09-15
+  - tag: schema-devtestlab-2016-05-15
+  - tag: schema-devtestlab-2015-05-21-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-devtestlab-2018-09-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devtestlab-2018-09-15' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DevTestLab/stable/2018-09-15/DTL.json
+
+```
+
+### Tag: schema-devtestlab-2016-05-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devtestlab-2016-05-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DevTestLab/stable/2016-05-15/DTL.json
+
+```
+
+### Tag: schema-devtestlab-2015-05-21-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devtestlab-2015-05-21-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DevTestLab/preview/2015-05-21-preview/DTL.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/digitaltwins/resource-manager/readme.azureresourceschema.md b/specification/digitaltwins/resource-manager/readme.azureresourceschema.md
index 0404c1db073e..32aca0b9a388 100644
--- a/specification/digitaltwins/resource-manager/readme.azureresourceschema.md
+++ b/specification/digitaltwins/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-digitaltwins-2020-03-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-digitaltwins-2020-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-digitaltwins-2020-03-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DigitalTwins/preview/2020-03-01-preview/digitaltwins.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/dnc/resource-manager/readme.azureresourceschema.md b/specification/dnc/resource-manager/readme.azureresourceschema.md
index 6718b2a0f484..bba0b7146906 100644
--- a/specification/dnc/resource-manager/readme.azureresourceschema.md
+++ b/specification/dnc/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-delegatednetwork-2020-08-08-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-delegatednetwork-2020-08-08-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-delegatednetwork-2020-08-08-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DelegatedNetwork/preview/2020-08-08-preview/DelegatedNetwork.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/dns/resource-manager/readme.azureresourceschema.md b/specification/dns/resource-manager/readme.azureresourceschema.md
index 50f02e4ceae1..743edd736482 100644
--- a/specification/dns/resource-manager/readme.azureresourceschema.md
+++ b/specification/dns/resource-manager/readme.azureresourceschema.md
@@ -5,18 +5,80 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-network-2018-05-01
+  - tag: schema-network-2018-03-01-preview
+  - tag: schema-network-2017-10-01
+  - tag: schema-network-2017-09-01
+  - tag: schema-network-2016-04-01
+  - tag: schema-network-2015-05-04-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-network-2018-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Network/stable/2018-05-01/dns.json
+
+```
+
+### Tag: schema-network-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/preview/2018-03-01-preview/dns.json
+
+```
+
+### Tag: schema-network-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-10-01/dns.json
+
+```
+
+### Tag: schema-network-2017-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-09-01/dns.json
+
+```
+
+### Tag: schema-network-2016-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2016-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2016-04-01/dns.json
+
+```
+
+### Tag: schema-network-2015-05-04-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2015-05-04-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/preview/2015-05-04-preview/dns.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/domainservices/resource-manager/readme.azureresourceschema.md b/specification/domainservices/resource-manager/readme.azureresourceschema.md
index 2144da9da4a8..24b8ecacf69b 100644
--- a/specification/domainservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/domainservices/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,46 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-aad-2020-01-01
+  - tag: schema-aad-2017-06-01
+  - tag: schema-aad-2017-01-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-aad-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-aad-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AAD/stable/2020-01-01/domainservices.json
   - Microsoft.AAD/stable/2020-01-01/oucontainer.json
+
+```
+
+### Tag: schema-aad-2017-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-aad-2017-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AAD/stable/2017-06-01/domainservices.json
   - Microsoft.AAD/stable/2017-06-01/oucontainer.json
+
+```
+
+### Tag: schema-aad-2017-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-aad-2017-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AAD/stable/2017-01-01/domainservices.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/engagementfabric/resource-manager/readme.azureresourceschema.md b/specification/engagementfabric/resource-manager/readme.azureresourceschema.md
index 7b3bc186ea8a..29aa52048494 100644
--- a/specification/engagementfabric/resource-manager/readme.azureresourceschema.md
+++ b/specification/engagementfabric/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-engagementfabric-2018-09-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-engagementfabric-2018-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-engagementfabric-2018-09-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.EngagementFabric/preview/2018-09-01/EngagementFabric.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/eventgrid/resource-manager/readme.azureresourceschema.md b/specification/eventgrid/resource-manager/readme.azureresourceschema.md
index 894645be9570..5afb66e43cbe 100644
--- a/specification/eventgrid/resource-manager/readme.azureresourceschema.md
+++ b/specification/eventgrid/resource-manager/readme.azureresourceschema.md
@@ -5,23 +5,140 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-eventgrid-2020-06-01
+  - tag: schema-eventgrid-2020-04-01-preview
+  - tag: schema-eventgrid-2020-01-01-preview
+  - tag: schema-eventgrid-2019-06-01
+  - tag: schema-eventgrid-2019-02-01-preview
+  - tag: schema-eventgrid-2019-01-01
+  - tag: schema-eventgrid-2018-09-15-preview
+  - tag: schema-eventgrid-2018-05-01-preview
+  - tag: schema-eventgrid-2018-01-01
+  - tag: schema-eventgrid-2017-09-15-preview
+  - tag: schema-eventgrid-2017-06-15-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-eventgrid-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.EventGrid/stable/2020-06-01/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2020-04-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2020-04-01-preview/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2020-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2020-01-01-preview/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/stable/2019-06-01/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2019-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2019-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2019-02-01-preview/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2019-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2019-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/stable/2019-01-01/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2018-09-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2018-09-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2018-09-15-preview/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2018-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2018-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2018-05-01-preview/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2018-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2018-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/stable/2018-01-01/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2017-09-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2017-09-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2017-09-15-preview/EventGrid.json
+
+```
+
+### Tag: schema-eventgrid-2017-06-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventgrid-2017-06-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventGrid/preview/2017-06-15-preview/EventGrid.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/eventhub/resource-manager/readme.azureresourceschema.md b/specification/eventhub/resource-manager/readme.azureresourceschema.md
index 42d5a6604c7c..3130b6b9875d 100644
--- a/specification/eventhub/resource-manager/readme.azureresourceschema.md
+++ b/specification/eventhub/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,39 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-eventhub-2018-01-01-preview
+  - tag: schema-eventhub-2017-04-01
+  - tag: schema-eventhub-2015-08-01
+  - tag: schema-eventhub-2014-09-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-eventhub-2018-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventhub-2018-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.EventHub/preview/2018-01-01-preview/AvailableClusterRegions-preview.json
+  - Microsoft.EventHub/preview/2018-01-01-preview/Clusters-preview.json
+  - Microsoft.EventHub/preview/2018-01-01-preview/ipfilterrules-preview.json
+  - Microsoft.EventHub/preview/2018-01-01-preview/namespaces-preview.json
+  - Microsoft.EventHub/preview/2018-01-01-preview/quotaConfiguration-preview.json
+  - Microsoft.EventHub/preview/2018-01-01-preview/virtualnetworkrules-preview.json
+  - Microsoft.EventHub/preview/2018-01-01-preview/networkrulessets-preview.json
+
+```
+
+### Tag: schema-eventhub-2017-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventhub-2017-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.EventHub/stable/2017-04-01/AuthorizationRules.json
   - Microsoft.EventHub/stable/2017-04-01/CheckNameAvailability.json
@@ -21,14 +48,27 @@ input-file:
   - Microsoft.EventHub/stable/2017-04-01/networkRuleSets.json
   - Microsoft.EventHub/stable/2017-04-01/operations.json
   - Microsoft.EventHub/stable/2017-04-01/sku.json
+
+```
+
+### Tag: schema-eventhub-2015-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventhub-2015-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventHub/stable/2015-08-01/EventHub.json
+
+```
+
+### Tag: schema-eventhub-2014-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-eventhub-2014-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.EventHub/stable/2014-09-01/EventHub.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/AvailableClusterRegions-preview.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/Clusters-preview.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/ipfilterrules-preview.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/namespaces-preview.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/quotaConfiguration-preview.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/virtualnetworkrules-preview.json
-  - Microsoft.EventHub/preview/2018-01-01-preview/networkrulessets-preview.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/frontdoor/resource-manager/readme.azureresourceschema.md b/specification/frontdoor/resource-manager/readme.azureresourceschema.md
index bf150effb8de..ced50d8c16cb 100644
--- a/specification/frontdoor/resource-manager/readme.azureresourceschema.md
+++ b/specification/frontdoor/resource-manager/readme.azureresourceschema.md
@@ -5,31 +5,137 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-network-2020-05-01
+  - tag: schema-network-2020-04-01
+  - tag: schema-network-2020-01-01
+  - tag: schema-network-2019-11-01
+  - tag: schema-network-2019-10-01
+  - tag: schema-network-2019-05-01
+  - tag: schema-network-2019-04-01
+  - tag: schema-network-2019-03-01-preview
+  - tag: schema-network-2019-03-01
+  - tag: schema-network-2018-08-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-network-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Network/stable/2020-05-01/network.json
-  - Microsoft.Network/stable/2019-11-01/networkexperiment.json
   - Microsoft.Network/stable/2020-05-01/frontdoor.json
+
+```
+
+### Tag: schema-network-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2020-04-01/webapplicationfirewall.json
   - Microsoft.Network/stable/2020-04-01/network.json
   - Microsoft.Network/stable/2020-04-01/frontdoor.json
+
+```
+
+### Tag: schema-network-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2020-01-01/network.json
   - Microsoft.Network/stable/2020-01-01/frontdoor.json
-  - Microsoft.Network/stable/2019-10-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Network/stable/2019-11-01/networkexperiment.json
   - Microsoft.Network/stable/2019-11-01/network.json
+
+```
+
+### Tag: schema-network-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Network/stable/2019-10-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-05-01/frontdoor.json
   - Microsoft.Network/stable/2019-05-01/network.json
-  - Microsoft.Network/stable/2019-03-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-04-01/frontdoor.json
   - Microsoft.Network/stable/2019-04-01/network.json
+
+```
+
+### Tag: schema-network-2019-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Network/preview/2019-03-01-preview/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Network/stable/2019-03-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2018-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/preview/2018-08-01-preview/frontdoor.json
   - Microsoft.Network/preview/2018-08-01-preview/network.json
-  - Microsoft.Network/preview/2019-03-01-preview/webapplicationfirewall.json
   - Microsoft.Network/preview/2018-08-01-preview/webapplicationfirewall.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/guestconfiguration/resource-manager/readme.azureresourceschema.md b/specification/guestconfiguration/resource-manager/readme.azureresourceschema.md
index a9a13390073e..22f8040208d4 100644
--- a/specification/guestconfiguration/resource-manager/readme.azureresourceschema.md
+++ b/specification/guestconfiguration/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-guestconfiguration-2020-06-25
+  - tag: schema-guestconfiguration-2018-11-20
+  - tag: schema-guestconfiguration-2018-06-30-preview
+  - tag: schema-guestconfiguration-2018-01-20-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-guestconfiguration-2020-06-25 and azureresourceschema
+
+``` yaml $(tag) == 'schema-guestconfiguration-2020-06-25' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json
+
+```
+
+### Tag: schema-guestconfiguration-2018-11-20 and azureresourceschema
+
+``` yaml $(tag) == 'schema-guestconfiguration-2018-11-20' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json
+
+```
+
+### Tag: schema-guestconfiguration-2018-06-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-guestconfiguration-2018-06-30-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.GuestConfiguration/preview/2018-06-30-preview/guestconfiguration.json
+
+```
+
+### Tag: schema-guestconfiguration-2018-01-20-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-guestconfiguration-2018-01-20-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.GuestConfiguration/preview/2018-01-20-preview/guestconfiguration.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/hanaonazure/resource-manager/readme.azureresourceschema.md b/specification/hanaonazure/resource-manager/readme.azureresourceschema.md
index 51c608625f3c..22ee3b84d3de 100644
--- a/specification/hanaonazure/resource-manager/readme.azureresourceschema.md
+++ b/specification/hanaonazure/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-hanaonazure-2020-02-07-preview
+  - tag: schema-hanaonazure-2017-11-03-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-hanaonazure-2020-02-07-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hanaonazure-2020-02-07-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json
   - Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-hanaonazure-2017-11-03-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hanaonazure-2017-11-03-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json
+
+```
diff --git a/specification/hardwaresecuritymodules/resource-manager/readme.azureresourceschema.md b/specification/hardwaresecuritymodules/resource-manager/readme.azureresourceschema.md
index df361f24540d..1bb0e7808dae 100644
--- a/specification/hardwaresecuritymodules/resource-manager/readme.azureresourceschema.md
+++ b/specification/hardwaresecuritymodules/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-hardwaresecuritymodules-2018-10-31-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-hardwaresecuritymodules-2018-10-31-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hardwaresecuritymodules-2018-10-31-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.HardwareSecurityModules/preview/2018-10-31-preview/dedicatedhsm.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/hdinsight/resource-manager/readme.azureresourceschema.md b/specification/hdinsight/resource-manager/readme.azureresourceschema.md
index fea39a0cf9e4..99c384687156 100644
--- a/specification/hdinsight/resource-manager/readme.azureresourceschema.md
+++ b/specification/hdinsight/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-hdinsight-2018-06-01-preview
+  - tag: schema-hdinsight-2015-03-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-hdinsight-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hdinsight-2018-06-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json
   - Microsoft.HDInsight/stable/2018-06-01-preview/applications.json
@@ -20,6 +28,16 @@ input-file:
   - Microsoft.HDInsight/stable/2018-06-01-preview/scriptActions.json
   - Microsoft.HDInsight/stable/2018-06-01-preview/operations.json
   - Microsoft.HDInsight/stable/2018-06-01-preview/virtualMachines.json
+
+```
+
+### Tag: schema-hdinsight-2015-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hdinsight-2015-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json
   - Microsoft.HDInsight/preview/2015-03-01-preview/applications.json
   - Microsoft.HDInsight/preview/2015-03-01-preview/locations.json
@@ -28,4 +46,4 @@ input-file:
   - Microsoft.HDInsight/preview/2015-03-01-preview/scriptActions.json
   - Microsoft.HDInsight/preview/2015-03-01-preview/operations.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/healthcareapis/resource-manager/readme.azureresourceschema.md b/specification/healthcareapis/resource-manager/readme.azureresourceschema.md
index 3ba0b570c80e..79acdb91e0c6 100644
--- a/specification/healthcareapis/resource-manager/readme.azureresourceschema.md
+++ b/specification/healthcareapis/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-healthcareapis-2019-09-16
+  - tag: schema-healthcareapis-2018-08-20-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-healthcareapis-2019-09-16 and azureresourceschema
+
+``` yaml $(tag) == 'schema-healthcareapis-2019-09-16' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.HealthcareApis/stable/2019-09-16/healthcare-apis.json
+
+```
+
+### Tag: schema-healthcareapis-2018-08-20-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-healthcareapis-2018-08-20-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/hybridcompute/resource-manager/readme.azureresourceschema.md b/specification/hybridcompute/resource-manager/readme.azureresourceschema.md
index fe8ebef79b97..ecf289d5125f 100644
--- a/specification/hybridcompute/resource-manager/readme.azureresourceschema.md
+++ b/specification/hybridcompute/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,81 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-hybridcompute-2020-08-15-preview
+  - tag: schema-hybridcompute-2020-08-02
+  - tag: schema-hybridcompute-2020-07-30-preview
+  - tag: schema-hybridcompute-2019-12-12
+  - tag: schema-hybridcompute-2019-08-02
+  - tag: schema-hybridcompute-2019-03-18
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-hybridcompute-2020-08-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridcompute-2020-08-15-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.HybridCompute/preview/2020-08-15-preview/HybridCompute.json
+  - Microsoft.HybridCompute/preview/2020-08-15-preview/privateLinkScopes.json
+
+```
+
+### Tag: schema-hybridcompute-2020-08-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridcompute-2020-08-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json
-  - Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json
-  - Microsoft.HybridCompute/stable/2019-12-12/HybridCompute.json
-  - Microsoft.HybridCompute/preview/2020-07-30-preview/HybridCompute.json
   - Microsoft.HybridCompute/stable/2020-08-02/HybridCompute.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-hybridcompute-2020-07-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridcompute-2020-07-30-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.HybridCompute/preview/2020-07-30-preview/HybridCompute.json
+
+```
+
+### Tag: schema-hybridcompute-2019-12-12 and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridcompute-2019-12-12' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.HybridCompute/stable/2019-12-12/HybridCompute.json
+
+```
+
+### Tag: schema-hybridcompute-2019-08-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridcompute-2019-08-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json
+
+```
+
+### Tag: schema-hybridcompute-2019-03-18 and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridcompute-2019-03-18' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json
+
+```
diff --git a/specification/hybridcompute/resource-manager/readme.md b/specification/hybridcompute/resource-manager/readme.md
index c85d2b4024ef..9e66c97b61a8 100644
--- a/specification/hybridcompute/resource-manager/readme.md
+++ b/specification/hybridcompute/resource-manager/readme.md
@@ -151,6 +151,8 @@ require: $(this-folder)/../../../profiles/readme.md
 
 # all the input files across all versions
 input-file:
+  - $(this-folder)/Microsoft.HybridCompute/preview/2020-08-15-preview/HybridCompute.json
+  - $(this-folder)/Microsoft.HybridCompute/preview/2020-08-15-preview/privateLinkScopes.json
   - $(this-folder)/Microsoft.HybridCompute/preview/2019-03-18/HybridCompute.json
   - $(this-folder)/Microsoft.HybridCompute/preview/2019-08-02/HybridCompute.json
   - $(this-folder)/Microsoft.HybridCompute/stable/2019-12-12/HybridCompute.json
diff --git a/specification/hybriddatamanager/resource-manager/readme.azureresourceschema.md b/specification/hybriddatamanager/resource-manager/readme.azureresourceschema.md
index 588cd3cf2196..3bbb7db8e693 100644
--- a/specification/hybriddatamanager/resource-manager/readme.azureresourceschema.md
+++ b/specification/hybriddatamanager/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-hybriddata-2019-06-01
+  - tag: schema-hybriddata-2016-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-hybriddata-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybriddata-2019-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.HybridData/stable/2019-06-01/hybriddata.json
+
+```
+
+### Tag: schema-hybriddata-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybriddata-2016-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.HybridData/stable/2016-06-01/hybriddata.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/hybridkubernetes/resource-manager/readme.azureresourceschema.md b/specification/hybridkubernetes/resource-manager/readme.azureresourceschema.md
index 25d83ba6ffe0..963de1cc8c8b 100644
--- a/specification/hybridkubernetes/resource-manager/readme.azureresourceschema.md
+++ b/specification/hybridkubernetes/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-kubernetes-2020-01-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-kubernetes-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-kubernetes-2020-01-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Kubernetes/preview/2020-01-01-preview/connectedClusters.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/hybridnetwork/resource-manager/readme.azureresourceschema.md b/specification/hybridnetwork/resource-manager/readme.azureresourceschema.md
index 93a4cd3b4da1..e01e8f7e4357 100644
--- a/specification/hybridnetwork/resource-manager/readme.azureresourceschema.md
+++ b/specification/hybridnetwork/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,19 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-hybridnetwork-2020-01-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-hybridnetwork-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-hybridnetwork-2020-01-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.HybridNetwork/preview/2020-01-01-preview/common.json
   - Microsoft.HybridNetwork/preview/2020-01-01-preview/virtualNetworkFunction.json
@@ -19,4 +26,4 @@ input-file:
   - Microsoft.HybridNetwork/preview/2020-01-01-preview/vendor.json
   - Microsoft.HybridNetwork/preview/2020-01-01-preview/virtualNetworkFunctionVendors.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/imagebuilder/resource-manager/readme.azureresourceschema.md b/specification/imagebuilder/resource-manager/readme.azureresourceschema.md
index c3800ba0fc60..2f006d12de43 100644
--- a/specification/imagebuilder/resource-manager/readme.azureresourceschema.md
+++ b/specification/imagebuilder/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-virtualmachineimages-2020-02-14
+  - tag: schema-virtualmachineimages-2019-05-01-preview
+  - tag: schema-virtualmachineimages-2019-02-01-preview
+  - tag: schema-virtualmachineimages-2018-02-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-virtualmachineimages-2020-02-14 and azureresourceschema
+
+``` yaml $(tag) == 'schema-virtualmachineimages-2020-02-14' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json
+
+```
+
+### Tag: schema-virtualmachineimages-2019-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-virtualmachineimages-2019-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json
-  - Microsoft.VirtualMachineImages/preview/2018-02-01-preview/imagebuilder.json
+
+```
+
+### Tag: schema-virtualmachineimages-2019-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-virtualmachineimages-2019-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.VirtualMachineImages/preview/2019-02-01-preview/imagebuilder.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-virtualmachineimages-2018-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-virtualmachineimages-2018-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.VirtualMachineImages/preview/2018-02-01-preview/imagebuilder.json
+
+```
diff --git a/specification/intune/resource-manager/readme.azureresourceschema.md b/specification/intune/resource-manager/readme.azureresourceschema.md
index 6f9052bf57c0..85e92609e955 100644
--- a/specification/intune/resource-manager/readme.azureresourceschema.md
+++ b/specification/intune/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-intune-2015-01-14-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-intune-2015-01-14-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-intune-2015-01-14-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Intune/preview/2015-01-14-preview/intune.json
-  - Microsoft.Intune/preview/2015-01-14-privatepreview/intune.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/iotcentral/resource-manager/readme.azureresourceschema.md b/specification/iotcentral/resource-manager/readme.azureresourceschema.md
index 2959eeb75ad3..3db7de0ae97a 100644
--- a/specification/iotcentral/resource-manager/readme.azureresourceschema.md
+++ b/specification/iotcentral/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-iotcentral-2018-09-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-iotcentral-2018-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-iotcentral-2018-09-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.IoTCentral/stable/2018-09-01/iotcentral.json
-  - Microsoft.IoTCentral/preview/2017-07-01-privatepreview/iotcentral.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/iothub/resource-manager/readme.azureresourceschema.md b/specification/iothub/resource-manager/readme.azureresourceschema.md
index 1f75ada38392..53f6e9287e78 100644
--- a/specification/iothub/resource-manager/readme.azureresourceschema.md
+++ b/specification/iothub/resource-manager/readme.azureresourceschema.md
@@ -5,26 +5,176 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-devices-2020-07-10-preview
+  - tag: schema-devices-2020-06-15
+  - tag: schema-devices-2020-04-01
+  - tag: schema-devices-2020-03-01
+  - tag: schema-devices-2019-11-04
+  - tag: schema-devices-2019-07-01-preview
+  - tag: schema-devices-2019-03-22-preview
+  - tag: schema-devices-2019-03-22
+  - tag: schema-devices-2018-12-01-preview
+  - tag: schema-devices-2018-04-01
+  - tag: schema-devices-2018-01-22
+  - tag: schema-devices-2017-07-01
+  - tag: schema-devices-2017-01-19
+  - tag: schema-devices-2016-02-03
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-devices-2020-07-10-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2020-07-10-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Devices/preview/2020-07-10-preview/iothub.json
+
+```
+
+### Tag: schema-devices-2020-06-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2020-06-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2020-06-15/iothub.json
+
+```
+
+### Tag: schema-devices-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2020-04-01/iothub.json
+
+```
+
+### Tag: schema-devices-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2020-03-01/iothub.json
+
+```
+
+### Tag: schema-devices-2019-11-04 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2019-11-04' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2019-11-04/iothub.json
+
+```
+
+### Tag: schema-devices-2019-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2019-07-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/preview/2019-07-01-preview/iothub.json
-  - Microsoft.Devices/stable/2019-03-22/iothub.json
+
+```
+
+### Tag: schema-devices-2019-03-22-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2019-03-22-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/preview/2019-03-22-preview/iothub.json
+
+```
+
+### Tag: schema-devices-2019-03-22 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2019-03-22' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Devices/stable/2019-03-22/iothub.json
+
+```
+
+### Tag: schema-devices-2018-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2018-12-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/preview/2018-12-01-preview/iothub.json
+
+```
+
+### Tag: schema-devices-2018-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2018-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2018-04-01/iothub.json
+
+```
+
+### Tag: schema-devices-2018-01-22 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2018-01-22' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2018-01-22/iothub.json
+
+```
+
+### Tag: schema-devices-2017-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2017-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2017-07-01/iothub.json
+
+```
+
+### Tag: schema-devices-2017-01-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2017-01-19' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2017-01-19/iothub.json
+
+```
+
+### Tag: schema-devices-2016-02-03 and azureresourceschema
+
+``` yaml $(tag) == 'schema-devices-2016-02-03' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Devices/stable/2016-02-03/iothub.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/iotspaces/resource-manager/readme.azureresourceschema.md b/specification/iotspaces/resource-manager/readme.azureresourceschema.md
index e4c43ec26c4b..280d1ea3abba 100644
--- a/specification/iotspaces/resource-manager/readme.azureresourceschema.md
+++ b/specification/iotspaces/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-iotspaces-2017-10-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-iotspaces-2017-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-iotspaces-2017-10-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.IoTSpaces/preview/2017-10-01-preview/iotspaces.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/keyvault/resource-manager/readme.azureresourceschema.md b/specification/keyvault/resource-manager/readme.azureresourceschema.md
index 89e1885daad7..c0807b7e70d0 100644
--- a/specification/keyvault/resource-manager/readme.azureresourceschema.md
+++ b/specification/keyvault/resource-manager/readme.azureresourceschema.md
@@ -5,25 +5,87 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-keyvault-2020-04-01-preview
+  - tag: schema-keyvault-2019-09-01
+  - tag: schema-keyvault-2018-02-14-preview
+  - tag: schema-keyvault-2018-02-14
+  - tag: schema-keyvault-2016-10-01
+  - tag: schema-keyvault-2015-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-keyvault-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-keyvault-2020-04-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.KeyVault/stable/2019-09-01/keyvault.json
-  - Microsoft.KeyVault/stable/2019-09-01/providers.json
   - Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json
   - Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json
   - Microsoft.KeyVault/preview/2020-04-01-preview/providers.json
   - Microsoft.KeyVault/preview/2020-04-01-preview/secrets.json
+
+```
+
+### Tag: schema-keyvault-2019-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-keyvault-2019-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.KeyVault/stable/2019-09-01/keyvault.json
+  - Microsoft.KeyVault/stable/2019-09-01/providers.json
+
+```
+
+### Tag: schema-keyvault-2018-02-14-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-keyvault-2018-02-14-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
   - Microsoft.KeyVault/preview/2018-02-14-preview/providers.json
+
+```
+
+### Tag: schema-keyvault-2018-02-14 and azureresourceschema
+
+``` yaml $(tag) == 'schema-keyvault-2018-02-14' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.KeyVault/stable/2018-02-14/keyvault.json
   - Microsoft.KeyVault/stable/2018-02-14/providers.json
+
+```
+
+### Tag: schema-keyvault-2016-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-keyvault-2016-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.KeyVault/stable/2016-10-01/keyvault.json
   - Microsoft.KeyVault/stable/2016-10-01/providers.json
+
+```
+
+### Tag: schema-keyvault-2015-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-keyvault-2015-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.KeyVault/stable/2015-06-01/keyvault.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md b/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md
index 0ecf8fd182b0..4d961e78a7d3 100644
--- a/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md
+++ b/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-kubernetesconfiguration-2019-11-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-kubernetesconfiguration-2019-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-kubernetesconfiguration-2019-11-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/labservices/resource-manager/readme.azureresourceschema.md b/specification/labservices/resource-manager/readme.azureresourceschema.md
index 588072c5de8c..50ff2afcfdf7 100644
--- a/specification/labservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/labservices/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-labservices-2018-10-15
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-labservices-2018-10-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-labservices-2018-10-15' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.LabServices/stable/2018-10-15/ML.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/logic/resource-manager/readme.azureresourceschema.md b/specification/logic/resource-manager/readme.azureresourceschema.md
index 0edbd6e2b6ba..409ee65ae052 100644
--- a/specification/logic/resource-manager/readme.azureresourceschema.md
+++ b/specification/logic/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,68 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-logic-2019-05-01
+  - tag: schema-logic-2018-07-01-preview
+  - tag: schema-logic-2016-06-01
+  - tag: schema-logic-2015-08-01-preview
+  - tag: schema-logic-2015-02-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-logic-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-logic-2019-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Logic/stable/2019-05-01/logic.json
+
+```
+
+### Tag: schema-logic-2018-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-logic-2018-07-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Logic/preview/2018-07-01-preview/logic.json
+
+```
+
+### Tag: schema-logic-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-logic-2016-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Logic/stable/2016-06-01/logic.json
+
+```
+
+### Tag: schema-logic-2015-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-logic-2015-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Logic/preview/2015-08-01-preview/logic.json
+
+```
+
+### Tag: schema-logic-2015-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-logic-2015-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Logic/preview/2015-02-01-preview/logic.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/machinelearning/resource-manager/readme.azureresourceschema.md b/specification/machinelearning/resource-manager/readme.azureresourceschema.md
index e84296cfee7c..6f38975b63c5 100644
--- a/specification/machinelearning/resource-manager/readme.azureresourceschema.md
+++ b/specification/machinelearning/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,57 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-machinelearning-2019-10-01
+  - tag: schema-machinelearning-2017-01-01
+  - tag: schema-machinelearning-2016-05-01-preview
+  - tag: schema-machinelearning-2016-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-machinelearning-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearning-2019-10-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.MachineLearning/stable/2019-10-01/workspaces.json
+
+```
+
+### Tag: schema-machinelearning-2017-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearning-2017-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.MachineLearning/stable/2017-01-01/webservices.json
+
+```
+
+### Tag: schema-machinelearning-2016-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearning-2016-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearning/preview/2016-05-01-preview/commitmentPlans.json
-  - Microsoft.MachineLearning/stable/2016-04-01/workspaces.json
-  - Microsoft.MachineLearning/stable/2019-10-01/workspaces.json
   - Microsoft.MachineLearning/preview/2016-05-01-preview/webservices.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-machinelearning-2016-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearning-2016-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.MachineLearning/stable/2016-04-01/workspaces.json
+
+```
diff --git a/specification/machinelearningcompute/resource-manager/readme.azureresourceschema.md b/specification/machinelearningcompute/resource-manager/readme.azureresourceschema.md
index 015121a18e7a..7e519071558f 100644
--- a/specification/machinelearningcompute/resource-manager/readme.azureresourceschema.md
+++ b/specification/machinelearningcompute/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-machinelearningcompute-2017-08-01-preview
+  - tag: schema-machinelearningcompute-2017-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-machinelearningcompute-2017-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningcompute-2017-08-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.MachineLearningCompute/preview/2017-08-01-preview/machineLearningCompute.json
+
+```
+
+### Tag: schema-machinelearningcompute-2017-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningcompute-2017-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningCompute/preview/2017-06-01-preview/machineLearningCompute.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/machinelearningexperimentation/resource-manager/readme.azureresourceschema.md b/specification/machinelearningexperimentation/resource-manager/readme.azureresourceschema.md
index 5c97caab4342..7bed65196c80 100644
--- a/specification/machinelearningexperimentation/resource-manager/readme.azureresourceschema.md
+++ b/specification/machinelearningexperimentation/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-machinelearningexperimentation-2017-05-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-machinelearningexperimentation-2017-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningexperimentation-2017-05-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.MachineLearningExperimentation/preview/2017-05-01-preview/machineLearningExperimentation.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/machinelearningservices/resource-manager/readme.azureresourceschema.md b/specification/machinelearningservices/resource-manager/readme.azureresourceschema.md
index 7743bd02db1e..0a9ab416c8d0 100644
--- a/specification/machinelearningservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/machinelearningservices/resource-manager/readme.azureresourceschema.md
@@ -5,26 +5,176 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-machinelearningservices-2020-09-01-preview
+  - tag: schema-machinelearningservices-2020-06-01
+  - tag: schema-machinelearningservices-2020-05-15-preview
+  - tag: schema-machinelearningservices-2020-05-01-preview
+  - tag: schema-machinelearningservices-2020-04-01-preview
+  - tag: schema-machinelearningservices-2020-04-01
+  - tag: schema-machinelearningservices-2020-03-01
+  - tag: schema-machinelearningservices-2020-02-18-preview
+  - tag: schema-machinelearningservices-2020-01-01
+  - tag: schema-machinelearningservices-2019-11-01
+  - tag: schema-machinelearningservices-2019-06-01
+  - tag: schema-machinelearningservices-2019-05-01
+  - tag: schema-machinelearningservices-2018-11-19
+  - tag: schema-machinelearningservices-2018-03-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-machinelearningservices-2020-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.MachineLearningServices/stable/2020-06-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-05-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-05-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/preview/2020-05-15-preview/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.MachineLearningServices/preview/2020-05-01-preview/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-04-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.MachineLearningServices/preview/2020-04-01-preview/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2020-04-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2020-03-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-02-18-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-02-18-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.MachineLearningServices/preview/2020-02-18-preview/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2019-06-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2019-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2019-05-01/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2018-11-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2018-11-19' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/stable/2018-11-19/machineLearningServices.json
-  - Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json
-  - Microsoft.MachineLearningServices/preview/2020-05-01-preview/machineLearningServices.json
-  - Microsoft.MachineLearningServices/preview/2020-04-01-preview/machineLearningServices.json
-  - Microsoft.MachineLearningServices/preview/2020-02-18-preview/machineLearningServices.json
+
+```
+
+### Tag: schema-machinelearningservices-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-machinelearningservices-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MachineLearningServices/preview/2018-03-01-preview/machineLearningServices.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/maintenance/resource-manager/readme.azureresourceschema.md b/specification/maintenance/resource-manager/readme.azureresourceschema.md
index c4d7a6f15778..ca97bf10f738 100644
--- a/specification/maintenance/resource-manager/readme.azureresourceschema.md
+++ b/specification/maintenance/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-maintenance-2020-07-01-preview
+  - tag: schema-maintenance-2020-04-01
+  - tag: schema-maintenance-2018-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-maintenance-2020-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-maintenance-2020-07-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Maintenance/preview/2020-07-01-preview/Maintenance.json
+
+```
+
+### Tag: schema-maintenance-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-maintenance-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Maintenance/stable/2020-04-01/Maintenance.json
+
+```
+
+### Tag: schema-maintenance-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-maintenance-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Maintenance/preview/2018-06-01-preview/Maintenance.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/managednetwork/resource-manager/readme.azureresourceschema.md b/specification/managednetwork/resource-manager/readme.azureresourceschema.md
index d10d4a681730..2a4dc2aa6f21 100644
--- a/specification/managednetwork/resource-manager/readme.azureresourceschema.md
+++ b/specification/managednetwork/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-managednetwork-2019-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-managednetwork-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-managednetwork-2019-06-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/managedservices/resource-manager/readme.azureresourceschema.md b/specification/managedservices/resource-manager/readme.azureresourceschema.md
index 70abf6f17056..2c60bbe0f4c2 100644
--- a/specification/managedservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/managedservices/resource-manager/readme.azureresourceschema.md
@@ -5,17 +5,68 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-managedservices-2020-02-01-preview
+  - tag: schema-managedservices-2019-09-01
+  - tag: schema-managedservices-2019-06-01
+  - tag: schema-managedservices-2019-04-01-preview
+  - tag: schema-managedservices-2018-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-managedservices-2020-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedservices-2020-02-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json
+
+```
+
+### Tag: schema-managedservices-2019-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedservices-2019-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ManagedServices/stable/2019-09-01/managedservices.json
+
+```
+
+### Tag: schema-managedservices-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedservices-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ManagedServices/stable/2019-06-01/managedservices.json
+
+```
+
+### Tag: schema-managedservices-2019-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedservices-2019-04-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json
+
+```
+
+### Tag: schema-managedservices-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedservices-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/managementgroups/resource-manager/readme.azureresourceschema.md b/specification/managementgroups/resource-manager/readme.azureresourceschema.md
index 555ba773a435..5361de218b69 100644
--- a/specification/managementgroups/resource-manager/readme.azureresourceschema.md
+++ b/specification/managementgroups/resource-manager/readme.azureresourceschema.md
@@ -5,19 +5,92 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-management-2020-05-01
+  - tag: schema-management-2020-02-01
+  - tag: schema-management-2019-11-01
+  - tag: schema-management-2018-03-01-preview
+  - tag: schema-management-2018-01-01-preview
+  - tag: schema-management-2017-11-01-preview
+  - tag: schema-management-2017-08-31-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-management-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2020-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Management/stable/2020-05-01/management.json
+
+```
+
+### Tag: schema-management-2020-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2020-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Management/stable/2020-02-01/management.json
+
+```
+
+### Tag: schema-management-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Management/stable/2019-11-01/management.json
+
+```
+
+### Tag: schema-management-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Management/preview/2018-03-01-preview/management.json
+
+```
+
+### Tag: schema-management-2018-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2018-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Management/preview/2018-01-01-preview/management.json
+
+```
+
+### Tag: schema-management-2017-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2017-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Management/preview/2017-11-01-preview/management.json
+
+```
+
+### Tag: schema-management-2017-08-31-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-management-2017-08-31-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Management/preview/2017-08-31-preview/management.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/managementpartner/resource-manager/readme.azureresourceschema.md b/specification/managementpartner/resource-manager/readme.azureresourceschema.md
index 3a82b66da63e..57b48d05aee9 100644
--- a/specification/managementpartner/resource-manager/readme.azureresourceschema.md
+++ b/specification/managementpartner/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-managementpartner-2018-02-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-managementpartner-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-managementpartner-2018-02-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ManagementPartner/preview/2018-02-01/ManagementPartner.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/maps/resource-manager/readme.azureresourceschema.md b/specification/maps/resource-manager/readme.azureresourceschema.md
index 75677e02e8ff..a11c8976cf6d 100644
--- a/specification/maps/resource-manager/readme.azureresourceschema.md
+++ b/specification/maps/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-maps-2020-02-01-preview
+  - tag: schema-maps-2018-05-01
+  - tag: schema-maps-2017-01-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-maps-2020-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-maps-2020-02-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Maps/preview/2020-02-01-preview/maps-management.json
-  - Microsoft.Maps/stable/2017-01-01-preview/maps-management.json
+
+```
+
+### Tag: schema-maps-2018-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-maps-2018-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Maps/stable/2018-05-01/maps-management.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-maps-2017-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-maps-2017-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Maps/stable/2017-01-01-preview/maps-management.json
+
+```
diff --git a/specification/mariadb/resource-manager/readme.azureresourceschema.md b/specification/mariadb/resource-manager/readme.azureresourceschema.md
index 7f5d42289a44..24eaf7c99a9d 100644
--- a/specification/mariadb/resource-manager/readme.azureresourceschema.md
+++ b/specification/mariadb/resource-manager/readme.azureresourceschema.md
@@ -5,24 +5,49 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-dbformariadb-2020-01-01
+  - tag: schema-dbformariadb-2018-06-01-preview
+  - tag: schema-dbformariadb-2018-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-dbformariadb-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformariadb-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DBforMariaDB/stable/2020-01-01/Servers.json
+
+```
+
+### Tag: schema-dbformariadb-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformariadb-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json
+
+```
+
+### Tag: schema-dbformariadb-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformariadb-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
   - Microsoft.DBforMariaDB/stable/2018-06-01/QueryPerformanceInsights.json
   - Microsoft.DBforMariaDB/stable/2018-06-01/PerformanceRecommendations.json
   - Microsoft.DBforMariaDB/stable/2018-06-01/PrivateEndpointConnections.json
   - Microsoft.DBforMariaDB/stable/2018-06-01/PrivateLinkResources.json
   - Microsoft.DBforMariaDB/stable/2018-06-01/ServerSecurityAlertPolicies.json
-  - Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/mariadb.json
-  - Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/PrivateEndpointConnections.json
-  - Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/PrivateLinkResources.json
-  - Microsoft.DBforMariaDB/preview/2020-01-01-privatepreview/DataEncryptionKeys.json
-  - Microsoft.DBforMariaDB/stable/2020-01-01/Servers.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/marketplace/resource-manager/readme.azureresourceschema.md b/specification/marketplace/resource-manager/readme.azureresourceschema.md
index 28818016f3ff..6c051e0c1b66 100644
--- a/specification/marketplace/resource-manager/readme.azureresourceschema.md
+++ b/specification/marketplace/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-marketplace-2020-01-01
+  - tag: schema-marketplace-2019-12-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-marketplace-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-marketplace-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.Marketplace/stable/2019-12-01/Marketplace.json
   - Microsoft.Marketplace/stable/2020-01-01/Marketplace.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-marketplace-2019-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-marketplace-2019-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Marketplace/stable/2019-12-01/Marketplace.json
+
+```
diff --git a/specification/marketplaceordering/resource-manager/readme.azureresourceschema.md b/specification/marketplaceordering/resource-manager/readme.azureresourceschema.md
index d7049a862b6c..03e5d9139526 100644
--- a/specification/marketplaceordering/resource-manager/readme.azureresourceschema.md
+++ b/specification/marketplaceordering/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-marketplaceordering-2015-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-marketplaceordering-2015-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-marketplaceordering-2015-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.MarketplaceOrdering/stable/2015-06-01/Agreements.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/mediaservices/resource-manager/readme.azureresourceschema.md b/specification/mediaservices/resource-manager/readme.azureresourceschema.md
index 78883925faaf..7dd1ee754fbb 100644
--- a/specification/mediaservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/mediaservices/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,26 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-media-2020-05-01
+  - tag: schema-media-2020-02-01-preview
+  - tag: schema-media-2019-09-01-preview
+  - tag: schema-media-2019-05-01-preview
+  - tag: schema-media-2018-07-01
+  - tag: schema-media-2018-06-01-preview
+  - tag: schema-media-2018-03-30-preview
+  - tag: schema-media-2015-10-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-media-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2020-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Media/stable/2020-05-01/AccountFilters.json
   - Microsoft.Media/stable/2020-05-01/Accounts.json
@@ -20,15 +34,38 @@ input-file:
   - Microsoft.Media/stable/2020-05-01/StreamingPoliciesAndStreamingLocators.json
   - Microsoft.Media/stable/2020-05-01/streamingservice.json
   - Microsoft.Media/stable/2020-05-01/Common.json
-  - Microsoft.Media/stable/2018-07-01/AccountFilters.json
-  - Microsoft.Media/stable/2018-07-01/Accounts.json
-  - Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json
-  - Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json
-  - Microsoft.Media/stable/2018-07-01/Encoding.json
+
+```
+
+### Tag: schema-media-2020-02-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2020-02-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json
-  - Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json
-  - Microsoft.Media/stable/2018-07-01/streamingservice.json
+
+```
+
+### Tag: schema-media-2019-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2019-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Media/preview/2019-09-01-preview/MediaGraphs.json
+
+```
+
+### Tag: schema-media-2019-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2019-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Media/preview/2019-05-01-preview/AccountFilters.json
   - Microsoft.Media/preview/2019-05-01-preview/Accounts.json
   - Microsoft.Media/preview/2019-05-01-preview/AssetsAndAssetFilters.json
@@ -37,14 +74,34 @@ input-file:
   - Microsoft.Media/preview/2019-05-01-preview/Encoding.json
   - Microsoft.Media/preview/2019-05-01-preview/StreamingPoliciesAndStreamingLocators.json
   - Microsoft.Media/preview/2019-05-01-preview/streamingservice.json
+
+```
+
+### Tag: schema-media-2018-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2018-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Media/stable/2018-07-01/AccountFilters.json
+  - Microsoft.Media/stable/2018-07-01/Accounts.json
+  - Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json
+  - Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json
+  - Microsoft.Media/stable/2018-07-01/Encoding.json
+  - Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json
+  - Microsoft.Media/stable/2018-07-01/streamingservice.json
   - Microsoft.Media/stable/2018-07-01/Common.json
-  - Microsoft.Media/stable/2015-10-01/media.json
-  - Microsoft.Media/preview/2018-03-30-preview/Accounts.json
-  - Microsoft.Media/preview/2018-03-30-preview/Assets.json
-  - Microsoft.Media/preview/2018-03-30-preview/ContentKeyPolicies.json
-  - Microsoft.Media/preview/2018-03-30-preview/Encoding.json
-  - Microsoft.Media/preview/2018-03-30-preview/StreamingPoliciesAndStreamingLocators.json
-  - Microsoft.Media/preview/2018-03-30-preview/streamingservice.json
+
+```
+
+### Tag: schema-media-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Media/preview/2018-06-01-preview/Accounts.json
   - Microsoft.Media/preview/2018-06-01-preview/Assets.json
   - Microsoft.Media/preview/2018-06-01-preview/ContentKeyPolicies.json
@@ -52,4 +109,31 @@ input-file:
   - Microsoft.Media/preview/2018-06-01-preview/StreamingPoliciesAndStreamingLocators.json
   - Microsoft.Media/preview/2018-06-01-preview/streamingservice.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-media-2018-03-30-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2018-03-30-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Media/preview/2018-03-30-preview/Accounts.json
+  - Microsoft.Media/preview/2018-03-30-preview/Assets.json
+  - Microsoft.Media/preview/2018-03-30-preview/ContentKeyPolicies.json
+  - Microsoft.Media/preview/2018-03-30-preview/Encoding.json
+  - Microsoft.Media/preview/2018-03-30-preview/StreamingPoliciesAndStreamingLocators.json
+  - Microsoft.Media/preview/2018-03-30-preview/streamingservice.json
+
+```
+
+### Tag: schema-media-2015-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-media-2015-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Media/stable/2015-10-01/media.json
+
+```
diff --git a/specification/migrate/resource-manager/readme.azureresourceschema.md b/specification/migrate/resource-manager/readme.azureresourceschema.md
index 2d0c82d45a3c..48e3a39e8a41 100644
--- a/specification/migrate/resource-manager/readme.azureresourceschema.md
+++ b/specification/migrate/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-offazure-2020-07-07
+  - tag: schema-offazure-2020-01-01
+  - tag: schema-migrate-2019-10-01
+  - tag: schema-migrate-2018-02-02
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-offazure-2020-07-07 and azureresourceschema
+
+``` yaml $(tag) == 'schema-offazure-2020-07-07' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.OffAzure/stable/2020-07-07/migrate.json
-  - Microsoft.Migrate/stable/2018-02-02/migrate.json
-  - Microsoft.Migrate/stable/2019-10-01/migrate.json
+
+```
+
+### Tag: schema-offazure-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-offazure-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.OffAzure/stable/2020-01-01/migrate.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-migrate-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-migrate-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Migrate/stable/2019-10-01/migrate.json
+
+```
+
+### Tag: schema-migrate-2018-02-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-migrate-2018-02-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Migrate/stable/2018-02-02/migrate.json
+
+```
diff --git a/specification/migrateprojects/resource-manager/readme.azureresourceschema.md b/specification/migrateprojects/resource-manager/readme.azureresourceschema.md
index f961026aec0a..53d53c148b61 100644
--- a/specification/migrateprojects/resource-manager/readme.azureresourceschema.md
+++ b/specification/migrateprojects/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-migrate-2018-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-migrate-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-migrate-2018-09-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Migrate/preview/2018-09-01-preview/migrate.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/mixedreality/resource-manager/readme.azureresourceschema.md b/specification/mixedreality/resource-manager/readme.azureresourceschema.md
index aea8c2ad2866..66cc5e9f90e2 100644
--- a/specification/mixedreality/resource-manager/readme.azureresourceschema.md
+++ b/specification/mixedreality/resource-manager/readme.azureresourceschema.md
@@ -5,20 +5,60 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-mixedreality-2020-05-01
+  - tag: schema-mixedreality-2020-04-06-preview
+  - tag: schema-mixedreality-2019-12-02-preview
+  - tag: schema-mixedreality-2019-02-28-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-mixedreality-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-mixedreality-2020-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.MixedReality/stable/2020-05-01/proxy.json
   - Microsoft.MixedReality/stable/2020-05-01/spatial-anchors.json
+
+```
+
+### Tag: schema-mixedreality-2020-04-06-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-mixedreality-2020-04-06-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MixedReality/preview/2020-04-06-preview/remote-rendering.json
   - Microsoft.MixedReality/preview/2020-04-06-preview/proxy.json
+
+```
+
+### Tag: schema-mixedreality-2019-12-02-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-mixedreality-2019-12-02-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MixedReality/preview/2019-12-02-preview/proxy.json
   - Microsoft.MixedReality/preview/2019-12-02-preview/remote-rendering.json
   - Microsoft.MixedReality/preview/2019-12-02-preview/spatial-anchors.json
+
+```
+
+### Tag: schema-mixedreality-2019-02-28-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-mixedreality-2019-02-28-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.MixedReality/preview/2019-02-28-preview/mixedreality.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/monitor/resource-manager/readme.azureresourceschema.md b/specification/monitor/resource-manager/readme.azureresourceschema.md
index 02d992c82458..64d73c4be188 100644
--- a/specification/monitor/resource-manager/readme.azureresourceschema.md
+++ b/specification/monitor/resource-manager/readme.azureresourceschema.md
@@ -5,54 +5,281 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-insights-2020-05-01-preview
+  - tag: schema-insights-2020-01-01-preview
+  - tag: schema-insights-2019-11-01-preview
+  - tag: schema-insights-2019-10-17-preview
+  - tag: schema-insights-2019-06-01
+  - tag: schema-insights-2019-03-01
+  - tag: schema-insights-2018-11-27-preview
+  - tag: schema-insights-2018-09-01
+  - tag: schema-insights-2018-06-01-preview
+  - tag: schema-insights-2018-04-16
+  - tag: schema-insights-2018-03-01
+  - tag: schema-insights-2018-01-01
+  - tag: schema-insights-2017-12-01-preview
+  - tag: schema-insights-2017-11-01-preview
+  - tag: schema-insights-2017-05-01-preview
+  - tag: schema-insights-2017-04-01
+  - tag: schema-insights-2017-03-01-preview
+  - tag: schema-insights-2016-09-01
+  - tag: schema-insights-2016-03-01
+  - tag: schema-insights-2015-07-01
+  - tag: schema-insights-2015-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-insights-2020-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2020-05-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json
+
+```
+
+### Tag: schema-insights-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2020-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/preview/2020-01-01-preview/managementGroupDiagnosticSettings_API.json
-  - Microsoft.Insights/stable/2015-04-01/autoscale_API.json
-  - Microsoft.Insights/stable/2015-04-01/operations_API.json
-  - Microsoft.Insights/stable/2016-03-01/alertRulesIncidents_API.json
-  - Microsoft.Insights/stable/2016-03-01/alertRules_API.json
-  - Microsoft.Insights/stable/2016-03-01/logProfiles_API.json
-  - Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json
-  - Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json
+
+```
+
+### Tag: schema-insights-2019-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2019-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRuleAssociations_API.json
+  - Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRules_API.json
+
+```
+
+### Tag: schema-insights-2019-10-17-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2019-10-17-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2019-10-17-preview/privateLinkScopes_API.json
+
+```
+
+### Tag: schema-insights-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/stable/2019-06-01/actionGroups_API.json
-  - Microsoft.Insights/stable/2017-04-01/activityLogAlerts_API.json
-  - Microsoft.Insights/stable/2015-04-01/activityLogs_API.json
-  - Microsoft.Insights/stable/2015-04-01/eventCategories_API.json
-  - Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json
-  - Microsoft.Insights/stable/2018-01-01/metricDefinitions_API.json
-  - Microsoft.Insights/stable/2018-01-01/metrics_API.json
-  - Microsoft.Insights/preview/2017-11-01-preview/baseline_API.json
-  - Microsoft.Insights/preview/2017-11-01-preview/calculateBaseline_API.json
+
+```
+
+### Tag: schema-insights-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/stable/2019-03-01/metricBaselines_API.json
-  - Microsoft.Insights/stable/2018-03-01/metricAlert_API.json
-  - Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json
-  - Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json
-  - Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json
-  - Microsoft.Insights/preview/2019-10-17-preview/privateLinkScopes_API.json
-  - Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json
   - Microsoft.Insights/stable/2019-03-01/actionGroups_API.json
+
+```
+
+### Tag: schema-insights-2018-11-27-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-11-27-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json
+
+```
+
+### Tag: schema-insights-2018-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/stable/2018-09-01/actionGroups_API.json
-  - Microsoft.Insights/stable/2018-03-01/actionGroups_API.json
-  - Microsoft.Insights/stable/2017-04-01/actionGroups_API.json
-  - Microsoft.Insights/preview/2017-05-01-preview/metricDefinitions_API.json
-  - Microsoft.Insights/preview/2017-05-01-preview/metrics_API.json
-  - Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRuleAssociations_API.json
-  - Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRules_API.json
   - Microsoft.Insights/stable/2018-09-01/baseline_API.json
   - Microsoft.Insights/stable/2018-09-01/calculateBaseline_API.json
+
+```
+
+### Tag: schema-insights-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/preview/2018-06-01-preview/guestDiagnosticSettingsAssociation_API.json
   - Microsoft.Insights/preview/2018-06-01-preview/guestDiagnosticSettings_API.json
+
+```
+
+### Tag: schema-insights-2018-04-16 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-04-16' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json
+
+```
+
+### Tag: schema-insights-2018-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/stable/2018-03-01/metricAlert_API.json
+  - Microsoft.Insights/stable/2018-03-01/actionGroups_API.json
+
+```
+
+### Tag: schema-insights-2018-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2018-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/stable/2018-01-01/metricDefinitions_API.json
+  - Microsoft.Insights/stable/2018-01-01/metrics_API.json
+
+```
+
+### Tag: schema-insights-2017-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2017-12-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json
+
+```
+
+### Tag: schema-insights-2017-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2017-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2017-11-01-preview/baseline_API.json
+  - Microsoft.Insights/preview/2017-11-01-preview/calculateBaseline_API.json
+
+```
+
+### Tag: schema-insights-2017-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2017-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json
+  - Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json
+  - Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json
+  - Microsoft.Insights/preview/2017-05-01-preview/metricDefinitions_API.json
+  - Microsoft.Insights/preview/2017-05-01-preview/metrics_API.json
+
+```
+
+### Tag: schema-insights-2017-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2017-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/stable/2017-04-01/activityLogAlerts_API.json
+  - Microsoft.Insights/stable/2017-04-01/actionGroups_API.json
+
+```
+
+### Tag: schema-insights-2017-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2017-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/preview/2017-03-01-preview/activityLogAlerts_API.json
+
+```
+
+### Tag: schema-insights-2016-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2016-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/stable/2016-09-01/metrics_API.json
   - Microsoft.Insights/stable/2016-09-01/serviceDiagnosticsSettings_API.json
+
+```
+
+### Tag: schema-insights-2016-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2016-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/stable/2016-03-01/alertRulesIncidents_API.json
+  - Microsoft.Insights/stable/2016-03-01/alertRules_API.json
+  - Microsoft.Insights/stable/2016-03-01/logProfiles_API.json
   - Microsoft.Insights/stable/2016-03-01/metricDefinitions_API.json
+
+```
+
+### Tag: schema-insights-2015-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2015-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Insights/stable/2015-07-01/serviceDiagnosticsSettings_API.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-insights-2015-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-insights-2015-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Insights/stable/2015-04-01/autoscale_API.json
+  - Microsoft.Insights/stable/2015-04-01/operations_API.json
+  - Microsoft.Insights/stable/2015-04-01/activityLogs_API.json
+  - Microsoft.Insights/stable/2015-04-01/eventCategories_API.json
+  - Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json
+
+```
diff --git a/specification/msi/resource-manager/readme.azureresourceschema.md b/specification/msi/resource-manager/readme.azureresourceschema.md
index cf6d808fe336..4ad17aca39dc 100644
--- a/specification/msi/resource-manager/readme.azureresourceschema.md
+++ b/specification/msi/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-managedidentity-2018-11-30
+  - tag: schema-managedidentity-2015-08-31-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-managedidentity-2018-11-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedidentity-2018-11-30' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ManagedIdentity/stable/2018-11-30/ManagedIdentity.json
+
+```
+
+### Tag: schema-managedidentity-2015-08-31-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-managedidentity-2015-08-31-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ManagedIdentity/preview/2015-08-31-preview/ManagedIdentity.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/mysql/resource-manager/readme.azureresourceschema.md b/specification/mysql/resource-manager/readme.azureresourceschema.md
index 118d8ee4b5b9..c16bc7ae0e11 100644
--- a/specification/mysql/resource-manager/readme.azureresourceschema.md
+++ b/specification/mysql/resource-manager/readme.azureresourceschema.md
@@ -5,26 +5,61 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-dbformysql-2020-01-01
+  - tag: schema-dbformysql-2018-06-01
+  - tag: schema-dbformysql-2017-12-01-preview
+  - tag: schema-dbformysql-2017-12-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-dbformysql-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformysql-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DBforMySQL/stable/2020-01-01/DataEncryptionKeys.json
+  - Microsoft.DBforMySQL/stable/2020-01-01/Servers.json
+
+```
+
+### Tag: schema-dbformysql-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformysql-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.DBforMySQL/preview/2017-12-01-preview/mysql.json
-  - Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
-  - Microsoft.DBforMySQL/stable/2017-12-01/ServerSecurityAlertPolicies.json
-  - Microsoft.DBforMySQL/preview/2018-06-01-privatepreview/mysql.json
-  - Microsoft.DBforMySQL/preview/2018-06-01-privatepreview/PrivateEndpointConnections.json
-  - Microsoft.DBforMySQL/preview/2018-06-01-privatepreview/PrivateLinkResources.json
   - Microsoft.DBforMySQL/stable/2018-06-01/QueryPerformanceInsights.json
   - Microsoft.DBforMySQL/stable/2018-06-01/PerformanceRecommendations.json
   - Microsoft.DBforMySQL/stable/2018-06-01/PrivateEndpointConnections.json
   - Microsoft.DBforMySQL/stable/2018-06-01/PrivateLinkResources.json
-  - Microsoft.DBforMySQL/preview/2020-01-01-privatepreview/DataEncryptionKeys.json
-  - Microsoft.DBforMySQL/stable/2020-01-01/DataEncryptionKeys.json
-  - Microsoft.DBforMySQL/stable/2020-01-01/Servers.json
-  - Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-dbformysql-2017-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformysql-2017-12-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DBforMySQL/preview/2017-12-01-preview/mysql.json
+
+```
+
+### Tag: schema-dbformysql-2017-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbformysql-2017-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
+  - Microsoft.DBforMySQL/stable/2017-12-01/ServerSecurityAlertPolicies.json
+
+```
diff --git a/specification/netapp/resource-manager/readme.azureresourceschema.md b/specification/netapp/resource-manager/readme.azureresourceschema.md
index cfe75081cedb..c7d6389bac95 100644
--- a/specification/netapp/resource-manager/readme.azureresourceschema.md
+++ b/specification/netapp/resource-manager/readme.azureresourceschema.md
@@ -5,21 +5,116 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-netapp-2020-06-01
+  - tag: schema-netapp-2020-02-01
+  - tag: schema-netapp-2019-11-01
+  - tag: schema-netapp-2019-10-01
+  - tag: schema-netapp-2019-08-01
+  - tag: schema-netapp-2019-07-01
+  - tag: schema-netapp-2019-06-01
+  - tag: schema-netapp-2019-05-01
+  - tag: schema-netapp-2017-08-15
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-netapp-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.NetApp/stable/2020-06-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2020-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2020-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2020-02-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2019-11-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2019-10-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2019-08-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2019-07-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2019-06-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2019-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/stable/2019-05-01/netapp.json
+
+```
+
+### Tag: schema-netapp-2017-08-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-netapp-2017-08-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NetApp/preview/2017-08-15/netapp.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/network/resource-manager/readme.azureresourceschema.md b/specification/network/resource-manager/readme.azureresourceschema.md
index 80f3479dd74f..9b05f08c959c 100644
--- a/specification/network/resource-manager/readme.azureresourceschema.md
+++ b/specification/network/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,51 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-network-2020-06-01
+  - tag: schema-network-2020-05-01
+  - tag: schema-network-2020-04-01
+  - tag: schema-network-2020-03-01
+  - tag: schema-network-2019-12-01
+  - tag: schema-network-2019-11-01
+  - tag: schema-network-2019-09-01
+  - tag: schema-network-2019-08-01
+  - tag: schema-network-2019-07-01
+  - tag: schema-network-2019-06-01
+  - tag: schema-network-2019-04-01
+  - tag: schema-network-2019-02-01
+  - tag: schema-network-2018-12-01
+  - tag: schema-network-2018-11-01
+  - tag: schema-network-2018-10-01
+  - tag: schema-network-2018-08-01
+  - tag: schema-network-2018-07-01
+  - tag: schema-network-2018-06-01
+  - tag: schema-network-2018-04-01
+  - tag: schema-network-2018-02-01
+  - tag: schema-network-2018-01-01
+  - tag: schema-network-2017-11-01
+  - tag: schema-network-2017-10-01
+  - tag: schema-network-2017-09-01
+  - tag: schema-network-2017-08-01
+  - tag: schema-network-2017-06-01
+  - tag: schema-network-2017-03-01
+  - tag: schema-network-2016-12-01
+  - tag: schema-network-2016-09-01
+  - tag: schema-network-2016-06-01
+  - tag: schema-network-2016-03-30
+  - tag: schema-network-2015-06-15
+  - tag: schema-network-2015-05-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-network-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Network/stable/2020-06-01/applicationGateway.json
   - Microsoft.Network/stable/2020-06-01/applicationSecurityGroup.json
@@ -59,6 +98,16 @@ input-file:
   - Microsoft.Network/stable/2020-06-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2020-06-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2020-06-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2020-05-01/applicationGateway.json
   - Microsoft.Network/stable/2020-05-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2020-05-01/availableDelegations.json
@@ -103,6 +152,16 @@ input-file:
   - Microsoft.Network/stable/2020-05-01/virtualWan.json
   - Microsoft.Network/stable/2020-05-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2020-05-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2020-04-01/applicationGateway.json
   - Microsoft.Network/stable/2020-04-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2020-04-01/availableDelegations.json
@@ -148,6 +207,16 @@ input-file:
   - Microsoft.Network/stable/2020-04-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2020-04-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2020-04-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2020-03-01/applicationGateway.json
   - Microsoft.Network/stable/2020-03-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2020-03-01/availableDelegations.json
@@ -193,6 +262,16 @@ input-file:
   - Microsoft.Network/stable/2020-03-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2020-03-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2020-03-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-12-01/applicationGateway.json
   - Microsoft.Network/stable/2019-12-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-12-01/availableDelegations.json
@@ -237,6 +316,16 @@ input-file:
   - Microsoft.Network/stable/2019-12-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-12-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-12-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-11-01/applicationGateway.json
   - Microsoft.Network/stable/2019-11-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-11-01/availableDelegations.json
@@ -280,6 +369,16 @@ input-file:
   - Microsoft.Network/stable/2019-11-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-11-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-11-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-09-01/applicationGateway.json
   - Microsoft.Network/stable/2019-09-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-09-01/availableDelegations.json
@@ -324,6 +423,16 @@ input-file:
   - Microsoft.Network/stable/2019-09-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-09-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-08-01/applicationGateway.json
   - Microsoft.Network/stable/2019-08-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-08-01/availableDelegations.json
@@ -367,6 +476,16 @@ input-file:
   - Microsoft.Network/stable/2019-08-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-08-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-07-01/applicationGateway.json
   - Microsoft.Network/stable/2019-07-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-07-01/availableDelegations.json
@@ -409,6 +528,16 @@ input-file:
   - Microsoft.Network/stable/2019-07-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-07-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-07-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-06-01/applicationGateway.json
   - Microsoft.Network/stable/2019-06-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-06-01/availableDelegations.json
@@ -450,6 +579,16 @@ input-file:
   - Microsoft.Network/stable/2019-06-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-06-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-06-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-04-01/applicationGateway.json
   - Microsoft.Network/stable/2019-04-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-04-01/availableDelegations.json
@@ -489,6 +628,16 @@ input-file:
   - Microsoft.Network/stable/2019-04-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-04-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-04-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2019-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2019-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2019-02-01/applicationGateway.json
   - Microsoft.Network/stable/2019-02-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2019-02-01/availableDelegations.json
@@ -525,6 +674,16 @@ input-file:
   - Microsoft.Network/stable/2019-02-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2019-02-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2019-02-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2018-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-12-01/applicationGateway.json
   - Microsoft.Network/stable/2018-12-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2018-12-01/availableDelegations.json
@@ -560,6 +719,16 @@ input-file:
   - Microsoft.Network/stable/2018-12-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-12-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2018-12-01/webapplicationfirewall.json
+
+```
+
+### Tag: schema-network-2018-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-11-01/applicationGateway.json
   - Microsoft.Network/stable/2018-11-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2018-11-01/availableDelegations.json
@@ -594,6 +763,16 @@ input-file:
   - Microsoft.Network/stable/2018-11-01/virtualWan.json
   - Microsoft.Network/stable/2018-11-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-11-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-10-01/applicationGateway.json
   - Microsoft.Network/stable/2018-10-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2018-10-01/availableDelegations.json
@@ -627,6 +806,16 @@ input-file:
   - Microsoft.Network/stable/2018-10-01/virtualWan.json
   - Microsoft.Network/stable/2018-10-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-10-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2018-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-08-01/applicationGateway.json
   - Microsoft.Network/stable/2018-08-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2018-08-01/availableDelegations.json
@@ -660,6 +849,16 @@ input-file:
   - Microsoft.Network/stable/2018-08-01/virtualWan.json
   - Microsoft.Network/stable/2018-08-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-08-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2018-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-07-01/azureFirewall.json
   - Microsoft.Network/stable/2018-07-01/applicationGateway.json
   - Microsoft.Network/stable/2018-07-01/applicationSecurityGroup.json
@@ -686,6 +885,16 @@ input-file:
   - Microsoft.Network/stable/2018-07-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-07-01/vmssPublicIpAddress.json
   - Microsoft.Network/stable/2018-07-01/serviceEndpointPolicy.json
+
+```
+
+### Tag: schema-network-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-06-01/azureFirewall.json
   - Microsoft.Network/stable/2018-06-01/applicationGateway.json
   - Microsoft.Network/stable/2018-06-01/applicationSecurityGroup.json
@@ -710,6 +919,16 @@ input-file:
   - Microsoft.Network/stable/2018-06-01/virtualWan.json
   - Microsoft.Network/stable/2018-06-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-06-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2018-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-04-01/azureFirewall.json
   - Microsoft.Network/stable/2018-04-01/applicationGateway.json
   - Microsoft.Network/stable/2018-04-01/applicationSecurityGroup.json
@@ -734,6 +953,16 @@ input-file:
   - Microsoft.Network/stable/2018-04-01/virtualWan.json
   - Microsoft.Network/stable/2018-04-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-04-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-02-01/applicationGateway.json
   - Microsoft.Network/stable/2018-02-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2018-02-01/checkDnsAvailability.json
@@ -756,6 +985,16 @@ input-file:
   - Microsoft.Network/stable/2018-02-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2018-02-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-02-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2018-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-01-01/applicationGateway.json
   - Microsoft.Network/stable/2018-01-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2018-01-01/checkDnsAvailability.json
@@ -776,6 +1015,16 @@ input-file:
   - Microsoft.Network/stable/2018-01-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2018-01-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2018-01-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2017-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-11-01/applicationGateway.json
   - Microsoft.Network/stable/2017-11-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2017-11-01/checkDnsAvailability.json
@@ -796,6 +1045,16 @@ input-file:
   - Microsoft.Network/stable/2017-11-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2017-11-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2017-11-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-10-01/applicationGateway.json
   - Microsoft.Network/stable/2017-10-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2017-10-01/checkDnsAvailability.json
@@ -816,6 +1075,16 @@ input-file:
   - Microsoft.Network/stable/2017-10-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2017-10-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2017-10-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2017-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-09-01/applicationGateway.json
   - Microsoft.Network/stable/2017-09-01/applicationSecurityGroup.json
   - Microsoft.Network/stable/2017-09-01/checkDnsAvailability.json
@@ -836,6 +1105,16 @@ input-file:
   - Microsoft.Network/stable/2017-09-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2017-09-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2017-09-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2017-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-08-01/applicationGateway.json
   - Microsoft.Network/stable/2017-08-01/checkDnsAvailability.json
   - Microsoft.Network/stable/2017-08-01/endpointService.json
@@ -854,6 +1133,16 @@ input-file:
   - Microsoft.Network/stable/2017-08-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2017-08-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2017-08-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2017-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-06-01/applicationGateway.json
   - Microsoft.Network/stable/2017-06-01/checkDnsAvailability.json
   - Microsoft.Network/stable/2017-06-01/endpointService.json
@@ -872,6 +1161,16 @@ input-file:
   - Microsoft.Network/stable/2017-06-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2017-06-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2017-06-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2017-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-03-01/applicationGateway.json
   - Microsoft.Network/stable/2017-03-01/checkDnsAvailability.json
   - Microsoft.Network/stable/2017-03-01/expressRouteCircuit.json
@@ -889,6 +1188,16 @@ input-file:
   - Microsoft.Network/stable/2017-03-01/virtualNetworkGateway.json
   - Microsoft.Network/stable/2017-03-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2017-03-01/vmssPublicIpAddress.json
+
+```
+
+### Tag: schema-network-2016-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2016-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2016-12-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2016-12-01/applicationGateway.json
   - Microsoft.Network/stable/2016-12-01/checkDnsAvailability.json
@@ -905,6 +1214,16 @@ input-file:
   - Microsoft.Network/stable/2016-12-01/usage.json
   - Microsoft.Network/stable/2016-12-01/virtualNetwork.json
   - Microsoft.Network/stable/2016-12-01/virtualNetworkGateway.json
+
+```
+
+### Tag: schema-network-2016-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2016-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2016-09-01/vmssNetworkInterface.json
   - Microsoft.Network/stable/2016-09-01/applicationGateway.json
   - Microsoft.Network/stable/2016-09-01/checkDnsAvailability.json
@@ -919,8 +1238,38 @@ input-file:
   - Microsoft.Network/stable/2016-09-01/usage.json
   - Microsoft.Network/stable/2016-09-01/virtualNetwork.json
   - Microsoft.Network/stable/2016-09-01/virtualNetworkGateway.json
+
+```
+
+### Tag: schema-network-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2016-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2016-06-01/network.json
+
+```
+
+### Tag: schema-network-2016-03-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2016-03-30' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2016-03-30/network.json
+
+```
+
+### Tag: schema-network-2015-06-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2015-06-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2015-06-15/applicationGateway.json
   - Microsoft.Network/stable/2015-06-15/checkDnsAvailability.json
   - Microsoft.Network/stable/2015-06-15/expressRouteCircuit.json
@@ -934,6 +1283,16 @@ input-file:
   - Microsoft.Network/stable/2015-06-15/virtualNetwork.json
   - Microsoft.Network/stable/2015-06-15/virtualNetworkGateway.json
   - Microsoft.Network/stable/2015-06-15/vmssNetworkInterface.json
+
+```
+
+### Tag: schema-network-2015-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2015-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/preview/2015-05-01-preview/network.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/notificationhubs/resource-manager/readme.azureresourceschema.md b/specification/notificationhubs/resource-manager/readme.azureresourceschema.md
index 48a7dd6f544f..d3ffdfc77fad 100644
--- a/specification/notificationhubs/resource-manager/readme.azureresourceschema.md
+++ b/specification/notificationhubs/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-notificationhubs-2017-04-01
+  - tag: schema-notificationhubs-2016-03-01
+  - tag: schema-notificationhubs-2014-09-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-notificationhubs-2017-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-notificationhubs-2017-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.NotificationHubs/stable/2017-04-01/notificationhubs.json
+
+```
+
+### Tag: schema-notificationhubs-2016-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-notificationhubs-2016-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NotificationHubs/stable/2016-03-01/notificationhubs.json
+
+```
+
+### Tag: schema-notificationhubs-2014-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-notificationhubs-2014-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.NotificationHubs/stable/2014-09-01/notificationhubs.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/operationalinsights/resource-manager/readme.azureresourceschema.md b/specification/operationalinsights/resource-manager/readme.azureresourceschema.md
index b0b6acd72d56..461f8cc494d4 100644
--- a/specification/operationalinsights/resource-manager/readme.azureresourceschema.md
+++ b/specification/operationalinsights/resource-manager/readme.azureresourceschema.md
@@ -5,19 +5,53 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-operationalinsights-2020-08-01
+  - tag: schema-operationalinsights-2020-03-01-preview
+  - tag: schema-operationalinsights-2019-08-01-preview
+  - tag: schema-operationalinsights-2015-11-01-preview
+  - tag: schema-operationalinsights-2015-03-20
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-operationalinsights-2020-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationalinsights-2020-08-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.OperationalInsights/stable/2020-08-01/DataExports.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/DataSources.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/IntelligencePacks.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/LinkedServices.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/LinkedStorageAccounts.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/ManagementGroups.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Operations.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/OperationStatuses.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/SharedKeys.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Usages.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Workspaces.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Clusters.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/StorageInsightConfigs.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/SavedSearches.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/AvailableServiceTiers.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Gateways.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Schema.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/WorkspacePurge.json
+  - Microsoft.OperationalInsights/stable/2020-08-01/Tables.json
+
+```
+
+### Tag: schema-operationalinsights-2020-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationalinsights-2020-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.OperationalInsights/preview/2015-11-01-preview/LinkedServices.json
-  - Microsoft.OperationalInsights/preview/2015-11-01-preview/OperationalInsights.json
-  - Microsoft.OperationalInsights/stable/2015-03-20/OperationalInsights.json
-  - Microsoft.OperationalInsights/preview/2019-08-01-preview/Clusters.json
-  - Microsoft.OperationalInsights/preview/2019-08-01-preview/LinkedServices.json
-  - Microsoft.OperationalInsights/preview/2019-08-01-preview/OperationalInsights.json
   - Microsoft.OperationalInsights/preview/2020-03-01-preview/DataExports.json
   - Microsoft.OperationalInsights/preview/2020-03-01-preview/DataSources.json
   - Microsoft.OperationalInsights/preview/2020-03-01-preview/DataCollectorLogs.json
@@ -38,24 +72,41 @@ input-file:
   - Microsoft.OperationalInsights/preview/2020-03-01-preview/Schema.json
   - Microsoft.OperationalInsights/preview/2020-03-01-preview/WorkspacePurge.json
   - Microsoft.OperationalInsights/preview/2020-03-01-preview/Tables.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/DataExports.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/DataSources.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/IntelligencePacks.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/LinkedServices.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/LinkedStorageAccounts.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/ManagementGroups.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Operations.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/OperationStatuses.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/SharedKeys.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Usages.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Workspaces.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Clusters.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/StorageInsightConfigs.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/SavedSearches.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/AvailableServiceTiers.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Gateways.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Schema.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/WorkspacePurge.json
-  - Microsoft.OperationalInsights/stable/2020-08-01/Tables.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-operationalinsights-2019-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationalinsights-2019-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.OperationalInsights/preview/2019-08-01-preview/Clusters.json
+  - Microsoft.OperationalInsights/preview/2019-08-01-preview/LinkedServices.json
+  - Microsoft.OperationalInsights/preview/2019-08-01-preview/OperationalInsights.json
+
+```
+
+### Tag: schema-operationalinsights-2015-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationalinsights-2015-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.OperationalInsights/preview/2015-11-01-preview/LinkedServices.json
+  - Microsoft.OperationalInsights/preview/2015-11-01-preview/OperationalInsights.json
+
+```
+
+### Tag: schema-operationalinsights-2015-03-20 and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationalinsights-2015-03-20' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.OperationalInsights/stable/2015-03-20/OperationalInsights.json
+
+```
diff --git a/specification/operationsmanagement/resource-manager/readme.azureresourceschema.md b/specification/operationsmanagement/resource-manager/readme.azureresourceschema.md
index 171b5a307794..5aa1c7bc845a 100644
--- a/specification/operationsmanagement/resource-manager/readme.azureresourceschema.md
+++ b/specification/operationsmanagement/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-operationsmanagement-2015-11-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-operationsmanagement-2015-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationsmanagement-2015-11-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.OperationsManagement/preview/2015-11-01-preview/OperationsManagement.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/peering/resource-manager/readme.azureresourceschema.md b/specification/peering/resource-manager/readme.azureresourceschema.md
index 97944c296748..a9bc36228266 100644
--- a/specification/peering/resource-manager/readme.azureresourceschema.md
+++ b/specification/peering/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-peering-2020-04-01
+  - tag: schema-peering-2020-01-01-preview
+  - tag: schema-peering-2019-09-01-preview
+  - tag: schema-peering-2019-08-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-peering-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-peering-2020-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Peering/stable/2020-04-01/peering.json
+
+```
+
+### Tag: schema-peering-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-peering-2020-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Peering/preview/2020-01-01-preview/peering.json
+
+```
+
+### Tag: schema-peering-2019-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-peering-2019-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Peering/preview/2019-09-01-preview/peering.json
+
+```
+
+### Tag: schema-peering-2019-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-peering-2019-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Peering/preview/2019-08-01-preview/peering.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/policyinsights/resource-manager/readme.azureresourceschema.md b/specification/policyinsights/resource-manager/readme.azureresourceschema.md
index c67e5d76b4af..7bf614fc2a2a 100644
--- a/specification/policyinsights/resource-manager/readme.azureresourceschema.md
+++ b/specification/policyinsights/resource-manager/readme.azureresourceschema.md
@@ -5,22 +5,62 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-policyinsights-2019-10-01
+  - tag: schema-policyinsights-2019-07-01
+  - tag: schema-policyinsights-2018-07-01-preview
+  - tag: schema-policyinsights-2018-04-04
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-policyinsights-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-policyinsights-2019-10-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.PolicyInsights/preview/2018-07-01-preview/policyTrackedResources.json
-  - Microsoft.PolicyInsights/stable/2019-07-01/remediations.json
   - Microsoft.PolicyInsights/stable/2019-10-01/policyEvents.json
   - Microsoft.PolicyInsights/stable/2019-10-01/policyStates.json
   - Microsoft.PolicyInsights/stable/2019-10-01/policyMetadata.json
+
+```
+
+### Tag: schema-policyinsights-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-policyinsights-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.PolicyInsights/stable/2019-07-01/remediations.json
+
+```
+
+### Tag: schema-policyinsights-2018-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-policyinsights-2018-07-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.PolicyInsights/preview/2018-07-01-preview/policyTrackedResources.json
   - Microsoft.PolicyInsights/preview/2018-07-01-preview/remediations.json
   - Microsoft.PolicyInsights/preview/2018-07-01-preview/policyEvents.json
   - Microsoft.PolicyInsights/preview/2018-07-01-preview/policyStates.json
+
+```
+
+### Tag: schema-policyinsights-2018-04-04 and azureresourceschema
+
+``` yaml $(tag) == 'schema-policyinsights-2018-04-04' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.PolicyInsights/stable/2018-04-04/policyEvents.json
   - Microsoft.PolicyInsights/stable/2018-04-04/policyStates.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/portal/resource-manager/readme.azureresourceschema.md b/specification/portal/resource-manager/readme.azureresourceschema.md
index 9cdb1c646613..6667c9568420 100644
--- a/specification/portal/resource-manager/readme.azureresourceschema.md
+++ b/specification/portal/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-portal-2019-01-01-preview
+  - tag: schema-portal-2018-10-01-preview
+  - tag: schema-portal-2015-08-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-portal-2019-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-portal-2019-01-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Portal/preview/2019-01-01-preview/portal.json
+
+```
+
+### Tag: schema-portal-2018-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-portal-2018-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Portal/preview/2018-10-01-preview/portal.json
+
+```
+
+### Tag: schema-portal-2015-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-portal-2015-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Portal/preview/2015-08-01-preview/portal.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/postgresql/resource-manager/readme.azureresourceschema.md b/specification/postgresql/resource-manager/readme.azureresourceschema.md
index af81c1dbc2c3..dc4fa2f7b514 100644
--- a/specification/postgresql/resource-manager/readme.azureresourceschema.md
+++ b/specification/postgresql/resource-manager/readme.azureresourceschema.md
@@ -5,22 +5,58 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-dbforpostgresql-2020-01-01
+  - tag: schema-dbforpostgresql-2018-06-01
+  - tag: schema-dbforpostgresql-2017-12-01-preview
+  - tag: schema-dbforpostgresql-2017-12-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-dbforpostgresql-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbforpostgresql-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DBforPostgreSQL/stable/2020-01-01/DataEncryptionKeys.json
+
+```
+
+### Tag: schema-dbforpostgresql-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbforpostgresql-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json
-  - Microsoft.DBforPostgreSQL/preview/2020-01-01-privatepreview/DataEncryptionKeys.json
-  - Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
-  - Microsoft.DBforPostgreSQL/stable/2017-12-01/ServerSecurityAlertPolicies.json
   - Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateEndpointConnections.json
   - Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateLinkResources.json
-  - Microsoft.DBforPostgreSQL/stable/2020-01-01/DataEncryptionKeys.json
-  - Microsoft.DBforPostgreSQL/preview/2018-06-01-privatepreview/PrivateEndpointConnections.json
-  - Microsoft.DBforPostgreSQL/preview/2018-06-01-privatepreview/PrivateLinkResources.json
+
+```
+
+### Tag: schema-dbforpostgresql-2017-12-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbforpostgresql-2017-12-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/postgresql.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-dbforpostgresql-2017-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-dbforpostgresql-2017-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
+  - Microsoft.DBforPostgreSQL/stable/2017-12-01/ServerSecurityAlertPolicies.json
+
+```
diff --git a/specification/powerbidedicated/resource-manager/readme.azureresourceschema.md b/specification/powerbidedicated/resource-manager/readme.azureresourceschema.md
index 49808da72420..0a9fe7a5e2bf 100644
--- a/specification/powerbidedicated/resource-manager/readme.azureresourceschema.md
+++ b/specification/powerbidedicated/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-powerbidedicated-2017-10-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-powerbidedicated-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-powerbidedicated-2017-10-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.PowerBIdedicated/stable/2017-10-01/powerbidedicated.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/powerbiembedded/resource-manager/readme.azureresourceschema.md b/specification/powerbiembedded/resource-manager/readme.azureresourceschema.md
index 708b06dde8fa..8fdb893fe252 100644
--- a/specification/powerbiembedded/resource-manager/readme.azureresourceschema.md
+++ b/specification/powerbiembedded/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-powerbi-2016-01-29
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-powerbi-2016-01-29 and azureresourceschema
+
+``` yaml $(tag) == 'schema-powerbi-2016-01-29' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.PowerBI/stable/2016-01-29/powerbiembedded.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/privatedns/resource-manager/readme.azureresourceschema.md b/specification/privatedns/resource-manager/readme.azureresourceschema.md
index 1e87d5638ed0..a79694033197 100644
--- a/specification/privatedns/resource-manager/readme.azureresourceschema.md
+++ b/specification/privatedns/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-network-2018-09-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-network-2018-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-09-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Network/stable/2018-09-01/privatedns.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/recoveryservices/resource-manager/readme.azureresourceschema.md b/specification/recoveryservices/resource-manager/readme.azureresourceschema.md
index 84d38930ded6..11cf9bda0ebb 100644
--- a/specification/recoveryservices/resource-manager/readme.azureresourceschema.md
+++ b/specification/recoveryservices/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,23 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-recoveryservices-2016-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-recoveryservices-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2016-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.RecoveryServices/stable/2016-06-01/registeredidentities.json
   - Microsoft.RecoveryServices/stable/2016-06-01/replicationusages.json
   - Microsoft.RecoveryServices/stable/2016-06-01/vaults.json
   - Microsoft.RecoveryServices/stable/2016-06-01/vaultusages.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/recoveryservicesbackup/resource-manager/readme.azureresourceschema.md b/specification/recoveryservicesbackup/resource-manager/readme.azureresourceschema.md
index 1c95f89cdabe..32e881468034 100644
--- a/specification/recoveryservicesbackup/resource-manager/readme.azureresourceschema.md
+++ b/specification/recoveryservicesbackup/resource-manager/readme.azureresourceschema.md
@@ -5,22 +5,117 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-recoveryservices-2020-07-01
+  - tag: schema-recoveryservices-2020-02-02
+  - tag: schema-recoveryservices-2019-06-15
+  - tag: schema-recoveryservices-2019-05-13
+  - tag: schema-recoveryservices-2018-12-20
+  - tag: schema-recoveryservices-2017-07-01
+  - tag: schema-recoveryservices-2016-12-01
+  - tag: schema-recoveryservices-2016-08-10
+  - tag: schema-recoveryservices-2016-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-recoveryservices-2020-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2020-07-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.RecoveryServices/stable/2020-07-01/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2020-02-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2020-02-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2020-02-02/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2019-06-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2019-06-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2019-06-15/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2019-05-13 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2019-05-13' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.RecoveryServices/stable/2019-05-13/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2018-12-20 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2018-12-20' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.RecoveryServices/stable/2018-12-20/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2017-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2017-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2017-07-01/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2016-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2016-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2016-12-01/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2016-08-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2016-08-10' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2016-08-10/operations.json
-  - Microsoft.RecoveryServices/stable/2019-05-13/bms.json
-  - Microsoft.RecoveryServices/stable/2018-12-20/bms.json
+
+```
+
+### Tag: schema-recoveryservices-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2016-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2016-06-01/recoveryservicesbackup.json
   - Microsoft.RecoveryServices/stable/2016-06-01/registeredIdentities.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/recoveryservicessiterecovery/resource-manager/readme.azureresourceschema.md b/specification/recoveryservicessiterecovery/resource-manager/readme.azureresourceschema.md
index 388d5b377d67..4e9dff193db3 100644
--- a/specification/recoveryservicessiterecovery/resource-manager/readme.azureresourceschema.md
+++ b/specification/recoveryservicessiterecovery/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-recoveryservices-2018-07-10
+  - tag: schema-recoveryservices-2018-01-10
+  - tag: schema-recoveryservices-2016-08-10
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-recoveryservices-2018-07-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2018-07-10' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.RecoveryServices/stable/2018-07-10/service.json
+
+```
+
+### Tag: schema-recoveryservices-2018-01-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2018-01-10' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2018-01-10/service.json
+
+```
+
+### Tag: schema-recoveryservices-2016-08-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-recoveryservices-2016-08-10' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.RecoveryServices/stable/2016-08-10/service.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/redhatopenshift/resource-manager/readme.azureresourceschema.md b/specification/redhatopenshift/resource-manager/readme.azureresourceschema.md
index f9c68e1fc771..0dcb1c1d1fea 100644
--- a/specification/redhatopenshift/resource-manager/readme.azureresourceschema.md
+++ b/specification/redhatopenshift/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-redhatopenshift-2020-04-30
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-redhatopenshift-2020-04-30 and azureresourceschema
+
+``` yaml $(tag) == 'schema-redhatopenshift-2020-04-30' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/redis/resource-manager/readme.azureresourceschema.md b/specification/redis/resource-manager/readme.azureresourceschema.md
index 0dd1ec0054cf..d18ffe6ad840 100644
--- a/specification/redis/resource-manager/readme.azureresourceschema.md
+++ b/specification/redis/resource-manager/readme.azureresourceschema.md
@@ -5,18 +5,80 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-cache-2019-07-01
+  - tag: schema-cache-2018-03-01
+  - tag: schema-cache-2017-10-01
+  - tag: schema-cache-2017-02-01
+  - tag: schema-cache-2016-04-01
+  - tag: schema-cache-2015-08-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-cache-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cache-2019-07-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Cache/preview/2019-07-01/redis.json
+
+```
+
+### Tag: schema-cache-2018-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cache-2018-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cache/stable/2018-03-01/redis.json
+
+```
+
+### Tag: schema-cache-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cache-2017-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cache/stable/2017-10-01/redis.json
+
+```
+
+### Tag: schema-cache-2017-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cache-2017-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cache/stable/2017-02-01/redis.json
+
+```
+
+### Tag: schema-cache-2016-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cache-2016-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cache/stable/2016-04-01/redis.json
+
+```
+
+### Tag: schema-cache-2015-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-cache-2015-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Cache/stable/2015-08-01/redis.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/regionmove/resource-manager/readme.azureresourceschema.md b/specification/regionmove/resource-manager/readme.azureresourceschema.md
index e78a1c40c923..ea58f5848a08 100644
--- a/specification/regionmove/resource-manager/readme.azureresourceschema.md
+++ b/specification/regionmove/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-migrate-2019-10-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-migrate-2019-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-migrate-2019-10-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Migrate/preview/2019-10-01-preview/regionmovecollection.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/regionmove/resource-manager/readme.md b/specification/regionmove/resource-manager/readme.md
index 429af72030c0..436d80c6d82a 100644
--- a/specification/regionmove/resource-manager/readme.md
+++ b/specification/regionmove/resource-manager/readme.md
@@ -88,11 +88,8 @@ See configuration in [readme.azureresourceschema.md](./readme.azureresourceschem
 
 
 ## Multi-API/Profile support for AutoRest v3 generators 
-
 AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
-
 This block is updated by an automatic script. Edits may be lost!
-
 ``` yaml $(tag) == 'all-api-versions' /* autogenerated */
 # include the azure profile definitions from the standard location
 require: $(this-folder)/../../../profiles/readme.md
@@ -102,12 +99,9 @@ input-file:
   - $(this-folder)/Microsoft.Migrate/preview/2019-10-01-preview/regionmovecollection.json
 
 ```
-
 If there are files that should not be in the `all-api-versions` set, 
 uncomment the  `exclude-file` section below and add the file paths.
-
 ``` yaml $(tag) == 'all-api-versions'
 #exclude-file: 
 #  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
 ```
-
diff --git a/specification/relay/resource-manager/readme.azureresourceschema.md b/specification/relay/resource-manager/readme.azureresourceschema.md
index 3d8a8db71d88..594e0810982e 100644
--- a/specification/relay/resource-manager/readme.azureresourceschema.md
+++ b/specification/relay/resource-manager/readme.azureresourceschema.md
@@ -5,18 +5,47 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-relay-2018-01-01-preview
+  - tag: schema-relay-2017-04-01
+  - tag: schema-relay-2016-07-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-relay-2018-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-relay-2018-01-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.Relay/stable/2017-04-01/relay.json
-  - Microsoft.Relay/stable/2016-07-01/relay.json
   - Microsoft.Relay/preview/2018-01-01-preview/Namespaces-preview.json
   - Microsoft.Relay/preview/2018-01-01-preview/NetworkRuleSets-preview.json
   - Microsoft.Relay/preview/2018-01-01-preview/PrivateEndpointConnection-preview.json
   - Microsoft.Relay/preview/2018-01-01-preview/PrivateLinkResources-preview.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-relay-2017-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-relay-2017-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Relay/stable/2017-04-01/relay.json
+
+```
+
+### Tag: schema-relay-2016-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-relay-2016-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Relay/stable/2016-07-01/relay.json
+
+```
diff --git a/specification/reservations/resource-manager/readme.azureresourceschema.md b/specification/reservations/resource-manager/readme.azureresourceschema.md
index 52e4ae505ead..8bdee0743c2a 100644
--- a/specification/reservations/resource-manager/readme.azureresourceschema.md
+++ b/specification/reservations/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-capacity-2019-07-19
+  - tag: schema-capacity-2019-04-01
+  - tag: schema-capacity-2018-06-01
+  - tag: schema-capacity-2017-11-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-capacity-2019-07-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-capacity-2019-07-19' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Capacity/preview/2019-07-19/quota.json
+
+```
+
+### Tag: schema-capacity-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-capacity-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Capacity/preview/2019-04-01/reservations.json
+
+```
+
+### Tag: schema-capacity-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-capacity-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Capacity/preview/2018-06-01/reservations.json
+
+```
+
+### Tag: schema-capacity-2017-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-capacity-2017-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Capacity/stable/2017-11-01/reservations.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/resourcegraph/resource-manager/readme.azureresourceschema.md b/specification/resourcegraph/resource-manager/readme.azureresourceschema.md
index d86e26a75e39..a7398d14c000 100644
--- a/specification/resourcegraph/resource-manager/readme.azureresourceschema.md
+++ b/specification/resourcegraph/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,45 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-resourcegraph-2020-04-01-preview
+  - tag: schema-resourcegraph-2019-04-01
+  - tag: schema-resourcegraph-2018-09-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-resourcegraph-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcegraph-2020-04-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ResourceGraph/preview/2020-04-01-preview/resourcegraph.json
+
+```
+
+### Tag: schema-resourcegraph-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcegraph-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ResourceGraph/stable/2019-04-01/resourcegraph.json
+
+```
+
+### Tag: schema-resourcegraph-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcegraph-2018-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ResourceGraph/preview/2018-09-01-preview/resourcegraph.json
   - Microsoft.ResourceGraph/preview/2018-09-01-preview/graphquery.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/resourcehealth/resource-manager/readme.azureresourceschema.md b/specification/resourcehealth/resource-manager/readme.azureresourceschema.md
index 9dfa5865fc24..cf5e58b870e5 100644
--- a/specification/resourcehealth/resource-manager/readme.azureresourceschema.md
+++ b/specification/resourcehealth/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-resourcehealth-2018-08-01
+  - tag: schema-resourcehealth-2018-07-01
+  - tag: schema-resourcehealth-2017-07-01
+  - tag: schema-resourcehealth-2015-01-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-resourcehealth-2018-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcehealth-2018-08-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.ResourceHealth/stable/2017-07-01/resourcehealth.json
-  - Microsoft.ResourceHealth/stable/2015-01-01/resourcehealth.json
   - Microsoft.ResourceHealth/preview/2018-08-01/ResourceHealth.json
+
+```
+
+### Tag: schema-resourcehealth-2018-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcehealth-2018-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ResourceHealth/stable/2018-07-01/ResourceHealth.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-resourcehealth-2017-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcehealth-2017-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ResourceHealth/stable/2017-07-01/resourcehealth.json
+
+```
+
+### Tag: schema-resourcehealth-2015-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resourcehealth-2015-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ResourceHealth/stable/2015-01-01/resourcehealth.json
+
+```
diff --git a/specification/resources/resource-manager/readme.azureresourceschema.md b/specification/resources/resource-manager/readme.azureresourceschema.md
index 79d595b5e1db..184386348e3a 100644
--- a/specification/resources/resource-manager/readme.azureresourceschema.md
+++ b/specification/resources/resource-manager/readme.azureresourceschema.md
@@ -5,67 +5,492 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-solutions-2020-08-21-preview
+  - tag: schema-solutions-2019-07-01
+  - tag: schema-solutions-2018-06-01
+  - tag: schema-solutions-2017-09-01
+  - tag: schema-solutions-2016-09-01-preview
+  - tag: schema-resources-2020-06-01
+  - tag: schema-resources-2020-01-01
+  - tag: schema-resources-2019-11-01
+  - tag: schema-resources-2019-10-01-preview
+  - tag: schema-resources-2019-10-01
+  - tag: schema-resources-2019-08-01
+  - tag: schema-resources-2019-07-01
+  - tag: schema-resources-2019-06-01-preview
+  - tag: schema-resources-2019-06-01
+  - tag: schema-resources-2019-05-10
+  - tag: schema-resources-2019-05-01
+  - tag: schema-resources-2019-03-01
+  - tag: schema-resources-2018-06-01
+  - tag: schema-resources-2018-05-01
+  - tag: schema-resources-2018-02-01
+  - tag: schema-resources-2017-05-10
+  - tag: schema-resources-2016-09-01
+  - tag: schema-resources-2016-07-01
+  - tag: schema-resources-2016-06-01
+  - tag: schema-resources-2016-02-01
+  - tag: schema-resources-2015-11-01
+  - tag: schema-features-2015-12-01
+  - tag: schema-authorization-2020-03-01
+  - tag: schema-authorization-2019-09-01
+  - tag: schema-authorization-2019-06-01
+  - tag: schema-authorization-2019-01-01
+  - tag: schema-authorization-2018-05-01
+  - tag: schema-authorization-2018-03-01
+  - tag: schema-authorization-2017-06-01-preview
+  - tag: schema-authorization-2016-12-01
+  - tag: schema-authorization-2016-09-01
+  - tag: schema-authorization-2016-04-01
+  - tag: schema-authorization-2015-10-01-preview
+  - tag: schema-authorization-2015-01-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-solutions-2020-08-21-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-solutions-2020-08-21-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Solutions/preview/2020-08-21-preview/managedapplications.json
+
+```
+
+### Tag: schema-solutions-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-solutions-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Solutions/stable/2019-07-01/managedapplications.json
+
+```
+
+### Tag: schema-solutions-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-solutions-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Solutions/stable/2018-06-01/managedapplications.json
+
+```
+
+### Tag: schema-solutions-2017-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-solutions-2017-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Solutions/stable/2017-09-01/managedapplications.json
+
+```
+
+### Tag: schema-solutions-2016-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-solutions-2016-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Solutions/preview/2016-09-01-preview/managedapplications.json
+
+```
+
+### Tag: schema-resources-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2020-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Resources/stable/2020-06-01/resources.json
+
+```
+
+### Tag: schema-resources-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Resources/stable/2020-01-01/subscriptions.json
+
+```
+
+### Tag: schema-resources-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-11-01/subscriptions.json
+
+```
+
+### Tag: schema-resources-2019-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json
+
+```
+
+### Tag: schema-resources-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-10-01/resources.json
+
+```
+
+### Tag: schema-resources-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-08-01/resources.json
+
+```
+
+### Tag: schema-resources-2019-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-07-01/resources.json
+
+```
+
+### Tag: schema-resources-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/preview/2019-06-01-preview/templateSpecs.json
+
+```
+
+### Tag: schema-resources-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-06-01/subscriptions.json
+
+```
+
+### Tag: schema-resources-2019-05-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-05-10' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-05-10/resources.json
+
+```
+
+### Tag: schema-resources-2019-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-05-01/resources.json
+
+```
+
+### Tag: schema-resources-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2019-03-01/resources.json
+
+```
+
+### Tag: schema-resources-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2018-06-01/subscriptions.json
+
+```
+
+### Tag: schema-resources-2018-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2018-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2018-05-01/resources.json
+
+```
+
+### Tag: schema-resources-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2018-02-01/resources.json
+
+```
+
+### Tag: schema-resources-2017-05-10 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2017-05-10' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2017-05-10/resources.json
+
+```
+
+### Tag: schema-resources-2016-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2016-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2016-09-01/resources.json
+  - Microsoft.Resources/stable/2016-09-01/links.json
+
+```
+
+### Tag: schema-resources-2016-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2016-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2016-07-01/resources.json
+
+```
+
+### Tag: schema-resources-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2016-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2016-06-01/subscriptions.json
+
+```
+
+### Tag: schema-resources-2016-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2016-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2016-02-01/resources.json
+
+```
+
+### Tag: schema-resources-2015-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-resources-2015-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Resources/stable/2015-11-01/resources.json
+  - Microsoft.Resources/stable/2015-11-01/subscriptions.json
+
+```
+
+### Tag: schema-features-2015-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-features-2015-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Features/stable/2015-12-01/features.json
-  - Microsoft.Authorization/stable/2016-09-01/locks.json
-  - Microsoft.Authorization/stable/2015-01-01/locks.json
+
+```
+
+### Tag: schema-authorization-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2020-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2020-03-01/policyAssignments.json
   - Microsoft.Authorization/stable/2020-03-01/policyDefinitions.json
   - Microsoft.Authorization/stable/2020-03-01/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2019-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2019-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2019-09-01/policyAssignments.json
   - Microsoft.Authorization/stable/2019-09-01/policyDefinitions.json
   - Microsoft.Authorization/stable/2019-09-01/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2019-06-01/policyAssignments.json
   - Microsoft.Authorization/stable/2019-06-01/policyDefinitions.json
   - Microsoft.Authorization/stable/2019-06-01/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2019-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2019-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2019-01-01/policyAssignments.json
   - Microsoft.Authorization/stable/2019-01-01/policyDefinitions.json
   - Microsoft.Authorization/stable/2019-01-01/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2018-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2018-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2018-05-01/policyAssignments.json
   - Microsoft.Authorization/stable/2018-05-01/policyDefinitions.json
   - Microsoft.Authorization/stable/2018-05-01/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2018-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2018-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2018-03-01/policyAssignments.json
   - Microsoft.Authorization/stable/2018-03-01/policyDefinitions.json
   - Microsoft.Authorization/stable/2018-03-01/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2017-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2017-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/preview/2017-06-01-preview/policyAssignments.json
   - Microsoft.Authorization/preview/2017-06-01-preview/policySetDefinitions.json
+
+```
+
+### Tag: schema-authorization-2016-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2016-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2016-12-01/policyDefinitions.json
-  - Microsoft.Resources/preview/2019-06-01-preview/templateSpecs.json
   - Microsoft.Authorization/stable/2016-12-01/policyAssignments.json
+
+```
+
+### Tag: schema-authorization-2016-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2016-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Authorization/stable/2016-09-01/locks.json
+
+```
+
+### Tag: schema-authorization-2016-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2016-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/stable/2016-04-01/policy.json
+
+```
+
+### Tag: schema-authorization-2015-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2015-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Authorization/preview/2015-10-01-preview/policy.json
-  - Microsoft.Resources/stable/2019-10-01/resources.json
-  - Microsoft.Resources/stable/2019-08-01/resources.json
-  - Microsoft.Resources/stable/2019-07-01/resources.json
-  - Microsoft.Resources/stable/2019-05-10/resources.json
-  - Microsoft.Resources/stable/2019-05-01/resources.json
-  - Microsoft.Resources/stable/2019-03-01/resources.json
-  - Microsoft.Resources/stable/2018-05-01/resources.json
-  - Microsoft.Resources/stable/2018-02-01/resources.json
-  - Microsoft.Resources/stable/2017-05-10/resources.json
-  - Microsoft.Resources/stable/2016-09-01/resources.json
-  - Microsoft.Resources/stable/2016-07-01/resources.json
-  - Microsoft.Resources/stable/2016-02-01/resources.json
-  - Microsoft.Resources/stable/2015-11-01/resources.json
-  - Microsoft.Resources/stable/2019-11-01/subscriptions.json
-  - Microsoft.Resources/stable/2019-06-01/subscriptions.json
-  - Microsoft.Resources/stable/2018-06-01/subscriptions.json
-  - Microsoft.Resources/stable/2016-06-01/subscriptions.json
-  - Microsoft.Resources/stable/2015-11-01/subscriptions.json
-  - Microsoft.Resources/stable/2016-09-01/links.json
-  - Microsoft.Solutions/stable/2019-07-01/managedapplications.json
-  - Microsoft.Solutions/stable/2018-06-01/managedapplications.json
-  - Microsoft.Solutions/stable/2017-09-01/managedapplications.json
-  - Microsoft.Solutions/preview/2016-09-01-preview/managedapplications.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-authorization-2015-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-authorization-2015-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Authorization/stable/2015-01-01/locks.json
+
+```
diff --git a/specification/scheduler/resource-manager/readme.azureresourceschema.md b/specification/scheduler/resource-manager/readme.azureresourceschema.md
index 068d6543aac7..623238bb5d07 100644
--- a/specification/scheduler/resource-manager/readme.azureresourceschema.md
+++ b/specification/scheduler/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-scheduler-2016-03-01
+  - tag: schema-scheduler-2016-01-01
+  - tag: schema-scheduler-2014-08-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-scheduler-2016-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-scheduler-2016-03-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Scheduler/stable/2016-03-01/scheduler.json
+
+```
+
+### Tag: schema-scheduler-2016-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-scheduler-2016-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Scheduler/stable/2016-01-01/scheduler.json
+
+```
+
+### Tag: schema-scheduler-2014-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-scheduler-2014-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Scheduler/preview/2014-08-01-preview/scheduler.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/search/resource-manager/readme.azureresourceschema.md b/specification/search/resource-manager/readme.azureresourceschema.md
index ebde4c3e749e..13dc9c705646 100644
--- a/specification/search/resource-manager/readme.azureresourceschema.md
+++ b/specification/search/resource-manager/readme.azureresourceschema.md
@@ -5,18 +5,80 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-search-2020-08-01-preview
+  - tag: schema-search-2020-08-01
+  - tag: schema-search-2020-03-13
+  - tag: schema-search-2019-10-01-preview
+  - tag: schema-search-2015-08-19
+  - tag: schema-search-2015-02-28
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-search-2020-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-search-2020-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Search/preview/2020-08-01-preview/search.json
+
+```
+
+### Tag: schema-search-2020-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-search-2020-08-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Search/stable/2020-08-01/search.json
+
+```
+
+### Tag: schema-search-2020-03-13 and azureresourceschema
+
+``` yaml $(tag) == 'schema-search-2020-03-13' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Search/stable/2020-03-13/search.json
+
+```
+
+### Tag: schema-search-2019-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-search-2019-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Search/preview/2019-10-01-preview/search.json
+
+```
+
+### Tag: schema-search-2015-08-19 and azureresourceschema
+
+``` yaml $(tag) == 'schema-search-2015-08-19' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Search/stable/2015-08-19/search.json
+
+```
+
+### Tag: schema-search-2015-02-28 and azureresourceschema
+
+``` yaml $(tag) == 'schema-search-2015-02-28' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Search/stable/2015-02-28/search.json
-  - Microsoft.Search/preview/2020-08-01-preview/search.json
-  - Microsoft.Search/preview/2019-10-01-preview/search.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/security/resource-manager/readme.azureresourceschema.md b/specification/security/resource-manager/readme.azureresourceschema.md
index 30856f907782..84dc1c926799 100644
--- a/specification/security/resource-manager/readme.azureresourceschema.md
+++ b/specification/security/resource-manager/readme.azureresourceschema.md
@@ -5,18 +5,167 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-security-2020-08-06-preview
+  - tag: schema-security-2020-01-01-preview
+  - tag: schema-security-2020-01-01
+  - tag: schema-security-2019-08-01
+  - tag: schema-security-2019-01-01-preview
+  - tag: schema-security-2019-01-01
+  - tag: schema-security-2018-06-01
+  - tag: schema-security-2017-08-01-preview
+  - tag: schema-security-2017-08-01
+  - tag: schema-security-2015-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-security-2020-08-06-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2020-08-06-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json
+  - Microsoft.Security/preview/2020-08-06-preview/iotSensors.json
+  - $(this-folder)/Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2020-08-06-preview/iotSensors.json
+
+```
+
+### Tag: schema-security-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2020-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Security/preview/2020-01-01-preview/secureScore.json
   - Microsoft.Security/preview/2020-01-01-preview/connectors.json
+  - $(this-folder)/Microsoft.Security/preview/2020-01-01-preview/secureScore.json
+  - $(this-folder)/Microsoft.Security/preview/2020-01-01-preview/connectors.json
+  - $(this-folder)/Microsoft.Security/preview/2020-01-01-preview/securityContacts.json
+
+```
+
+### Tag: schema-security-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Security/stable/2020-01-01/serverVulnerabilityAssessments.json
+  - Microsoft.Security/stable/2020-01-01/assessmentMetadata.json
+  - Microsoft.Security/stable/2020-01-01/assessments.json
+  - Microsoft.Security/stable/2020-01-01/applicationWhitelistings.json
+  - Microsoft.Security/stable/2020-01-01/adaptiveNetworkHardenings.json
+  - Microsoft.Security/stable/2020-01-01/allowedConnections.json
+  - Microsoft.Security/stable/2020-01-01/topologies.json
+  - Microsoft.Security/stable/2020-01-01/alerts.json
+  - Microsoft.Security/stable/2020-01-01/jitNetworkAccessPolicies.json
+  - Microsoft.Security/stable/2020-01-01/discoveredSecuritySolutions.json
+  - Microsoft.Security/stable/2020-01-01/securitySolutionsReferenceData.json
+  - Microsoft.Security/stable/2020-01-01/externalSecuritySolutions.json
+  - Microsoft.Security/stable/2020-01-01/SecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/serverVulnerabilityAssessments.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/assessmentMetadata.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/assessments.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/applicationWhitelistings.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/adaptiveNetworkHardenings.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/allowedConnections.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/topologies.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/alerts.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/jitNetworkAccessPolicies.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/discoveredSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/securitySolutionsReferenceData.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/SecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/externalSecuritySolutions.json
+
+```
+
+### Tag: schema-security-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
+  - Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
+  - Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
+  - Microsoft.Security/stable/2019-08-01/iotAlertTypes.json
+  - Microsoft.Security/stable/2019-08-01/iotAlerts.json
+  - Microsoft.Security/stable/2019-08-01/iotRecommendationTypes.json
+  - Microsoft.Security/stable/2019-08-01/iotRecommendations.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotAlertTypes.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotAlerts.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotRecommendationTypes.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotRecommendations.json
+
+```
+
+### Tag: schema-security-2019-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2019-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Security/preview/2019-01-01-preview/automations.json
   - Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
   - Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
+  - Microsoft.Security/preview/2019-01-01-preview/alertsSuppressionRules.json
+  - Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
+  - Microsoft.Security/preview/2019-01-01-preview/assessments.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/automations.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/alertsSuppressionRules.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessments.json
+
+```
+
+### Tag: schema-security-2019-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2019-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Security/stable/2019-01-01/alerts.json
+  - Microsoft.Security/stable/2019-01-01/settings.json
+  - Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/settings.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json
+
+```
+
+### Tag: schema-security-2018-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2018-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Security/stable/2018-06-01/pricings.json
+  - $(this-folder)/Microsoft.Security/stable/2018-06-01/pricings.json
+
+```
+
+### Tag: schema-security-2017-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2017-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Security/preview/2017-08-01-preview/pricings.json
   - Microsoft.Security/preview/2017-08-01-preview/securityContacts.json
   - Microsoft.Security/preview/2017-08-01-preview/workspaceSettings.json
@@ -26,6 +175,41 @@ input-file:
   - Microsoft.Security/preview/2017-08-01-preview/deviceSecurityGroups.json
   - Microsoft.Security/preview/2017-08-01-preview/settings.json
   - Microsoft.Security/preview/2017-08-01-preview/informationProtectionPolicies.json
+  - Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutions.json
+  - Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutionAnalytics.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/pricings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/securityContacts.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/workspaceSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/autoProvisioningSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/compliances.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/advancedThreatProtectionSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/deviceSecurityGroups.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/settings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/informationProtectionPolicies.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutionAnalytics.json
+
+```
+
+### Tag: schema-security-2017-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2017-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Security/stable/2017-08-01/complianceResults.json
+  - $(this-folder)/Microsoft.Security/stable/2017-08-01/complianceResults.json
+
+```
+
+### Tag: schema-security-2015-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-security-2015-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Security/preview/2015-06-01-preview/operations.json
   - Microsoft.Security/preview/2015-06-01-preview/locations.json
   - Microsoft.Security/preview/2015-06-01-preview/tasks.json
@@ -37,36 +221,16 @@ input-file:
   - Microsoft.Security/preview/2015-06-01-preview/topologies.json
   - Microsoft.Security/preview/2015-06-01-preview/allowedConnections.json
   - Microsoft.Security/preview/2015-06-01-preview/adaptiveNetworkHardenings.json
-  - Microsoft.Security/preview/2019-01-01-preview/alertsSuppressionRules.json
-  - Microsoft.Security/stable/2018-06-01/pricings.json
-  - Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutions.json
-  - Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutionAnalytics.json
-  - Microsoft.Security/stable/2019-01-01/alerts.json
-  - Microsoft.Security/stable/2017-08-01/complianceResults.json
-  - Microsoft.Security/stable/2019-01-01/settings.json
-  - Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json
-  - Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
-  - Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
-  - Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
-  - Microsoft.Security/stable/2019-08-01/iotAlertTypes.json
-  - Microsoft.Security/stable/2019-08-01/iotAlerts.json
-  - Microsoft.Security/stable/2019-08-01/iotRecommendationTypes.json
-  - Microsoft.Security/stable/2019-08-01/iotRecommendations.json
-  - Microsoft.Security/stable/2020-01-01/serverVulnerabilityAssessments.json
-  - Microsoft.Security/stable/2020-01-01/assessmentMetadata.json
-  - Microsoft.Security/stable/2020-01-01/assessments.json
-  - Microsoft.Security/stable/2020-01-01/applicationWhitelistings.json
-  - Microsoft.Security/stable/2020-01-01/adaptiveNetworkHardenings.json
-  - Microsoft.Security/stable/2020-01-01/allowedConnections.json
-  - Microsoft.Security/stable/2020-01-01/topologies.json
-  - Microsoft.Security/stable/2020-01-01/jitNetworkAccessPolicies.json
-  - Microsoft.Security/stable/2020-01-01/discoveredSecuritySolutions.json
-  - Microsoft.Security/stable/2020-01-01/securitySolutionsReferenceData.json
-  - Microsoft.Security/stable/2020-01-01/externalSecuritySolutions.json
-  - Microsoft.Security/stable/2020-01-01/SecuritySolutions.json
-  - Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json
-  - Microsoft.Security/preview/2020-08-06-preview/iotSensors.json
-  - Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
-  - Microsoft.Security/preview/2019-01-01-preview/assessments.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/operations.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/locations.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/tasks.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/alerts.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/discoveredSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/jitNetworkAccessPolicies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/applicationWhitelistings.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/externalSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/topologies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/allowedConnections.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/adaptiveNetworkHardenings.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/securityinsights/resource-manager/readme.azureresourceschema.md b/specification/securityinsights/resource-manager/readme.azureresourceschema.md
index 332f4fcdedc9..c1616a19b90a 100644
--- a/specification/securityinsights/resource-manager/readme.azureresourceschema.md
+++ b/specification/securityinsights/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-securityinsights-2020-01-01
+  - tag: schema-securityinsights-2019-01-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-securityinsights-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-securityinsights-2020-01-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.SecurityInsights/stable/2020-01-01/SecurityInsights.json
+
+```
+
+### Tag: schema-securityinsights-2019-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-securityinsights-2019-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/serialconsole/resource-manager/readme.azureresourceschema.md b/specification/serialconsole/resource-manager/readme.azureresourceschema.md
index c50b4b1adf49..3b81576bee0f 100644
--- a/specification/serialconsole/resource-manager/readme.azureresourceschema.md
+++ b/specification/serialconsole/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-serialconsole-2018-05-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-serialconsole-2018-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-serialconsole-2018-05-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.SerialConsole/stable/2018-05-01/serialconsole.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/service-map/resource-manager/readme.azureresourceschema.md b/specification/service-map/resource-manager/readme.azureresourceschema.md
index eb0b1b911435..a92884d7690c 100644
--- a/specification/service-map/resource-manager/readme.azureresourceschema.md
+++ b/specification/service-map/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-operationalinsights-2015-11-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-operationalinsights-2015-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-operationalinsights-2015-11-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.OperationalInsights/preview/2015-11-01-preview/arm-service-map.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/servicebus/resource-manager/readme.azureresourceschema.md b/specification/servicebus/resource-manager/readme.azureresourceschema.md
index 4218563c7bf5..3bd281d594f7 100644
--- a/specification/servicebus/resource-manager/readme.azureresourceschema.md
+++ b/specification/servicebus/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-servicebus-2018-01-01-preview
+  - tag: schema-servicebus-2017-04-01
+  - tag: schema-servicebus-2015-08-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-servicebus-2018-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicebus-2018-01-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ServiceBus/preview/2018-01-01-preview/servicebus-preview.json
+
+```
+
+### Tag: schema-servicebus-2017-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicebus-2017-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceBus/stable/2017-04-01/servicebus.json
+
+```
+
+### Tag: schema-servicebus-2015-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicebus-2015-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceBus/stable/2015-08-01/servicebus.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/servicefabric/resource-manager/readme.azureresourceschema.md b/specification/servicefabric/resource-manager/readme.azureresourceschema.md
index 10113937c134..b30a3ce1e405 100644
--- a/specification/servicefabric/resource-manager/readme.azureresourceschema.md
+++ b/specification/servicefabric/resource-manager/readme.azureresourceschema.md
@@ -5,28 +5,123 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-servicefabric-2020-03-01
+  - tag: schema-servicefabric-2020-01-01-preview
+  - tag: schema-servicefabric-2019-11-01-preview
+  - tag: schema-servicefabric-2019-06-01-preview
+  - tag: schema-servicefabric-2019-03-01-preview
+  - tag: schema-servicefabric-2019-03-01
+  - tag: schema-servicefabric-2018-02-01
+  - tag: schema-servicefabric-2017-07-01-preview
+  - tag: schema-servicefabric-2016-09-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-servicefabric-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2020-03-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ServiceFabric/stable/2020-03-01/cluster.json
   - Microsoft.ServiceFabric/stable/2020-03-01/application.json
+
+```
+
+### Tag: schema-servicefabric-2020-01-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2020-01-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json
   - Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json
+
+```
+
+### Tag: schema-servicefabric-2019-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2019-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/preview/2019-11-01-preview/cluster.json
   - Microsoft.ServiceFabric/preview/2019-11-01-preview/application.json
+
+```
+
+### Tag: schema-servicefabric-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2019-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/preview/2019-06-01-preview/cluster.json
   - Microsoft.ServiceFabric/preview/2019-06-01-preview/application.json
-  - Microsoft.ServiceFabric/stable/2019-03-01/cluster.json
-  - Microsoft.ServiceFabric/stable/2019-03-01/application.json
+
+```
+
+### Tag: schema-servicefabric-2019-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2019-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/preview/2019-03-01-preview/cluster.json
   - Microsoft.ServiceFabric/preview/2019-03-01-preview/application.json
+
+```
+
+### Tag: schema-servicefabric-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ServiceFabric/stable/2019-03-01/cluster.json
+  - Microsoft.ServiceFabric/stable/2019-03-01/application.json
+
+```
+
+### Tag: schema-servicefabric-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/stable/2018-02-01/cluster.json
+
+```
+
+### Tag: schema-servicefabric-2017-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2017-07-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/preview/2017-07-01-preview/application.json
   - Microsoft.ServiceFabric/preview/2017-07-01-preview/servicefabric.json
+
+```
+
+### Tag: schema-servicefabric-2016-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabric-2016-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabric/stable/2016-09-01/servicefabric.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/servicefabricmesh/resource-manager/readme.azureresourceschema.md b/specification/servicefabricmesh/resource-manager/readme.azureresourceschema.md
index 349c42a969b4..db5f575e8158 100644
--- a/specification/servicefabricmesh/resource-manager/readme.azureresourceschema.md
+++ b/specification/servicefabricmesh/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-servicefabricmesh-2018-09-01-preview
+  - tag: schema-servicefabricmesh-2018-07-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-servicefabricmesh-2018-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabricmesh-2018-09-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.ServiceFabricMesh/preview/2018-09-01-preview/servicefabricmesh.json
+
+```
+
+### Tag: schema-servicefabricmesh-2018-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-servicefabricmesh-2018-07-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.ServiceFabricMesh/preview/2018-07-01-preview/servicefabricmesh.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/signalr/resource-manager/readme.azureresourceschema.md b/specification/signalr/resource-manager/readme.azureresourceschema.md
index 2107b2c08748..30a00dfcb8df 100644
--- a/specification/signalr/resource-manager/readme.azureresourceschema.md
+++ b/specification/signalr/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-signalrservice-2020-07-01-preview
+  - tag: schema-signalrservice-2020-05-01
+  - tag: schema-signalrservice-2018-10-01
+  - tag: schema-signalrservice-2018-03-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-signalrservice-2020-07-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-signalrservice-2020-07-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.SignalRService/preview/2020-07-01-preview/signalr.json
+
+```
+
+### Tag: schema-signalrservice-2020-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-signalrservice-2020-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.SignalRService/stable/2020-05-01/signalr.json
+
+```
+
+### Tag: schema-signalrservice-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-signalrservice-2018-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.SignalRService/stable/2018-10-01/signalr.json
+
+```
+
+### Tag: schema-signalrservice-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-signalrservice-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.SignalRService/preview/2018-03-01-preview/signalr.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/softwareplan/resource-manager/readme.azureresourceschema.md b/specification/softwareplan/resource-manager/readme.azureresourceschema.md
index 94ccb8b01669..0193b0961d94 100644
--- a/specification/softwareplan/resource-manager/readme.azureresourceschema.md
+++ b/specification/softwareplan/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-softwareplan-2019-12-01
+  - tag: schema-softwareplan-2019-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-softwareplan-2019-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-softwareplan-2019-12-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.SoftwarePlan/preview/2019-06-01-preview/softwareplan.json
   - Microsoft.SoftwarePlan/stable/2019-12-01/softwareplan.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-softwareplan-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-softwareplan-2019-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.SoftwarePlan/preview/2019-06-01-preview/softwareplan.json
+
+```
diff --git a/specification/sql/resource-manager/readme.azureresourceschema.md b/specification/sql/resource-manager/readme.azureresourceschema.md
index 576c9ac5494a..b6beef658200 100644
--- a/specification/sql/resource-manager/readme.azureresourceschema.md
+++ b/specification/sql/resource-manager/readme.azureresourceschema.md
@@ -5,115 +5,59 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-sql-2020-02-02-preview
+  - tag: schema-sql-2019-06-01-preview
+  - tag: schema-sql-2018-06-01-preview
+  - tag: schema-sql-2017-10-01-preview
+  - tag: schema-sql-2017-03-01-preview
+  - tag: schema-sql-2015-05-01-preview
+  - tag: schema-sql-2015-05-01
+  - tag: schema-sql-2014-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-sql-2020-02-02-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2020-02-02-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.Sql/stable/2014-04-01/backups.json
-  - Microsoft.Sql/stable/2014-04-01/connectionPolicies.json
-  - Microsoft.Sql/stable/2014-04-01/databaseSecurityAlertPolicies.json
-  - Microsoft.Sql/stable/2014-04-01/dataMasking.json
-  - Microsoft.Sql/stable/2014-04-01/firewallRules.json
-  - Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json
-  - Microsoft.Sql/stable/2014-04-01/metrics.json
-  - Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json
-  - Microsoft.Sql/stable/2014-04-01/replicationLinks.json
-  - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json
-  - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json
-  - Microsoft.Sql/stable/2014-04-01/sql.core.json
-  - Microsoft.Sql/stable/2014-04-01/usages.json
-  - Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json
-  - Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json
-  - Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json
-  - Microsoft.Sql/preview/2015-05-01-preview/operations.json
-  - Microsoft.Sql/preview/2015-05-01-preview/serverKeys.json
-  - Microsoft.Sql/preview/2015-05-01-preview/syncAgents.json
-  - Microsoft.Sql/preview/2015-05-01-preview/usages.json
-  - Microsoft.Sql/preview/2015-05-01-preview/virtualclusters.json
-  - Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json
-  - Microsoft.Sql/preview/2017-03-01-preview/blobAuditing.json
-  - Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json
-  - Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json
-  - Microsoft.Sql/preview/2017-03-01-preview/jobs.json
-  - Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json
-  - Microsoft.Sql/preview/2017-03-01-preview/ManagedBackupShortTermRetention.json
-  - Microsoft.Sql/preview/2017-03-01-preview/ManagedRestorableDroppedDatabaseBackupShortTermRetenion.json
-  - Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
-  - Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
-  - Microsoft.Sql/preview/2017-03-01-preview/serverSecurityAlertPolicies.json
-  - Microsoft.Sql/preview/2017-03-01-preview/restorableDroppedManagedDatabases.json
-  - Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
-  - Microsoft.Sql/preview/2017-03-01-preview/ManagedDatabaseSecurityAlertPolicies.json
-  - Microsoft.Sql/preview/2017-03-01-preview/ManagedServerSecurityAlertPolicy.json
-  - Microsoft.Sql/preview/2017-03-01-preview/SensitivityLabels.json
-  - Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json
-  - Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json
-  - Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json
-  - Microsoft.Sql/preview/2017-10-01-preview/databases.json
-  - Microsoft.Sql/preview/2017-10-01-preview/elasticPools.json
-  - Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
-  - Microsoft.Sql/preview/2017-10-01-preview/managedDatabaseVulnerabilityAssesmentRuleBaselines.json
-  - Microsoft.Sql/preview/2017-10-01-preview/managedDatabaseVulnerabilityAssessmentScans.json
-  - Microsoft.Sql/preview/2017-10-01-preview/managedDatabaseVulnerabilityAssessments.json
-  - Microsoft.Sql/preview/2017-10-01-preview/instanceFailoverGroups.json
-  - Microsoft.Sql/preview/2017-10-01-preview/TdeCertificates.json
-  - Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceTdeCertificates.json
-  - Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceKeys.json
-  - Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceEncryptionProtectors.json
-  - Microsoft.Sql/preview/2017-10-01-preview/recoverableManagedDatabases.json
-  - Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceVulnerabilityAssessments.json
-  - Microsoft.Sql/preview/2018-06-01-preview/ServerVulnerabilityAssessments.json
-  - Microsoft.Sql/preview/2018-06-01-preview/managedDatabaseSensitivityLabels.json
-  - Microsoft.Sql/preview/2018-06-01-preview/instancePools.json
-  - Microsoft.Sql/preview/2018-06-01-preview/usages.json
-  - Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json
-  - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json
-  - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json
-  - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json
-  - Microsoft.Sql/preview/2019-06-01-preview/servers.json
-  - Microsoft.Sql/preview/2018-06-01-preview/capabilities.json
-  - Microsoft.Sql/preview/2018-06-01-preview/LongTermRetentionManagedInstanceBackups.json
-  - Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceLongTermRetentionPolicies.json
-  - Microsoft.Sql/preview/2019-06-01-preview/WorkloadGroups.json
-  - Microsoft.Sql/preview/2019-06-01-preview/WorkloadClassifiers.json
-  - Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json
-  - Microsoft.Sql/preview/2019-06-01-preview/ServerAzureADAdministrators.json
-  - Microsoft.Sql/preview/2019-06-01-preview/syncGroups.json
-  - Microsoft.Sql/preview/2019-06-01-preview/syncMembers.json
-  - Microsoft.Sql/preview/2019-06-01-preview/FailoverManagedInstance.json
   - Microsoft.Sql/preview/2020-02-02-preview/shortTermRetentionPolicies.json
   - Microsoft.Sql/preview/2020-02-02-preview/managedDatabases.json
   - Microsoft.Sql/preview/2020-02-02-preview/ServerAzureADOnlyAuthentications.json
   - Microsoft.Sql/preview/2020-02-02-preview/managedInstances.json
   - Microsoft.Sql/preview/2020-02-02-preview/importexport.json
-  - Microsoft.Sql/stable/2014-04-01/capabilities.json
-  - Microsoft.Sql/stable/2014-04-01/databases.json
-  - Microsoft.Sql/stable/2014-04-01/elasticPools.json
-  - Microsoft.Sql/stable/2014-04-01/importExport.json
-  - Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json
-  - Microsoft.Sql/preview/2017-03-01-preview/renameDatabase.json
-  - Microsoft.Sql/preview/2017-10-01-preview/shortTermRetentionPolicies.json
-  - Microsoft.Sql/stable/2014-04-01/checkNameAvailability.json
-  - Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json
-  - Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json
-  - Microsoft.Sql/preview/2015-05-01-preview/servers.json
-  - Microsoft.Sql/preview/2015-05-01-preview/syncGroups.json
-  - Microsoft.Sql/preview/2015-05-01-preview/syncMembers.json
-  - Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json
-  - Microsoft.Sql/preview/2017-03-01-preview/dataWarehouseUserActivities.json
-  - Microsoft.Sql/preview/2017-03-01-preview/managedDatabases.json
-  - Microsoft.Sql/stable/2014-04-01/restorePoints.json
-  - Microsoft.Sql/stable/2015-05-01/capabilities.json
-  - Microsoft.Sql/preview/2015-05-01-preview/blobAuditing.json
+  - Microsoft.Sql/preview/2020-02-02-preview/ManagedInstanceAzureADOnlyAuthentications.json
   - ./Microsoft.Sql/preview/2020-02-02-preview/DatabaseSecurityAlertPolicies.json
   - ./Microsoft.Sql/preview/2020-02-02-preview/ManagedServerSecurityAlertPolicies.json
   - ./Microsoft.Sql/preview/2020-02-02-preview/ServerSecurityAlertPolicies.json
   - ./Microsoft.Sql/preview/2020-02-02-preview/operations.json
   - ./Microsoft.Sql/preview/2020-02-02-preview/managedDatabases.json
   - ./Microsoft.Sql/preview/2020-02-02-preview/managedInstances.json
+  - ./Microsoft.Sql/preview/2020-02-02-preview/ServerAzureADOnlyAuthentications.json
+  - ./Microsoft.Sql/preview/2020-02-02-preview/ManagedInstanceAzureADOnlyAuthentications.json
+
+```
+
+### Tag: schema-sql-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2019-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/preview/2019-06-01-preview/servers.json
+  - Microsoft.Sql/preview/2019-06-01-preview/WorkloadGroups.json
+  - Microsoft.Sql/preview/2019-06-01-preview/WorkloadClassifiers.json
+  - Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json
+  - Microsoft.Sql/preview/2019-06-01-preview/ServerAzureADAdministrators.json
+  - Microsoft.Sql/preview/2019-06-01-preview/syncGroups.json
+  - Microsoft.Sql/preview/2019-06-01-preview/syncMembers.json
+  - Microsoft.Sql/preview/2019-06-01-preview/FailoverManagedInstance.json
   - ./Microsoft.Sql/preview/2019-06-01-preview/databases.json
   - ./Microsoft.Sql/preview/2019-06-01-preview/managedDatabases.json
   - ./Microsoft.Sql/preview/2019-06-01-preview/serverOperations.json
@@ -125,6 +69,28 @@ input-file:
   - ./Microsoft.Sql/preview/2019-06-01-preview/syncGroups.json
   - ./Microsoft.Sql/preview/2019-06-01-preview/syncMembers.json
   - ./Microsoft.Sql/preview/2019-06-01-preview/FailoverManagedInstance.json
+
+```
+
+### Tag: schema-sql-2018-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2018-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceVulnerabilityAssessments.json
+  - Microsoft.Sql/preview/2018-06-01-preview/ServerVulnerabilityAssessments.json
+  - Microsoft.Sql/preview/2018-06-01-preview/managedDatabaseSensitivityLabels.json
+  - Microsoft.Sql/preview/2018-06-01-preview/instancePools.json
+  - Microsoft.Sql/preview/2018-06-01-preview/usages.json
+  - Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json
+  - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json
+  - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json
+  - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json
+  - Microsoft.Sql/preview/2018-06-01-preview/capabilities.json
+  - Microsoft.Sql/preview/2018-06-01-preview/LongTermRetentionManagedInstanceBackups.json
+  - Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceLongTermRetentionPolicies.json
   - ./Microsoft.Sql/preview/2018-06-01-preview/DatabaseSecurityAlertPolicies.json
   - ./Microsoft.Sql/preview/2018-06-01-preview/managedDatabaseSensitivityLabels.json
   - ./Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceVulnerabilityAssessments.json
@@ -140,6 +106,31 @@ input-file:
   - ./Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json
   - ./Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceLongTermRetentionPolicies.json
   - ./Microsoft.Sql/preview/2018-06-01-preview/LongTermRetentionManagedInstanceBackups.json
+
+```
+
+### Tag: schema-sql-2017-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2017-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json
+  - Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json
+  - Microsoft.Sql/preview/2017-10-01-preview/databases.json
+  - Microsoft.Sql/preview/2017-10-01-preview/elasticPools.json
+  - Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
+  - Microsoft.Sql/preview/2017-10-01-preview/managedDatabaseVulnerabilityAssesmentRuleBaselines.json
+  - Microsoft.Sql/preview/2017-10-01-preview/managedDatabaseVulnerabilityAssessmentScans.json
+  - Microsoft.Sql/preview/2017-10-01-preview/managedDatabaseVulnerabilityAssessments.json
+  - Microsoft.Sql/preview/2017-10-01-preview/instanceFailoverGroups.json
+  - Microsoft.Sql/preview/2017-10-01-preview/TdeCertificates.json
+  - Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceTdeCertificates.json
+  - Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceKeys.json
+  - Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceEncryptionProtectors.json
+  - Microsoft.Sql/preview/2017-10-01-preview/recoverableManagedDatabases.json
+  - Microsoft.Sql/preview/2017-10-01-preview/shortTermRetentionPolicies.json
   - ./Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json
   - ./Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json
   - ./Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
@@ -156,6 +147,36 @@ input-file:
   - ./Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceKeys.json
   - ./Microsoft.Sql/preview/2017-10-01-preview/ManagedInstanceEncryptionProtectors.json
   - ./Microsoft.Sql/preview/2017-10-01-preview/recoverableManagedDatabases.json
+
+```
+
+### Tag: schema-sql-2017-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2017-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/preview/2017-03-01-preview/blobAuditing.json
+  - Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json
+  - Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json
+  - Microsoft.Sql/preview/2017-03-01-preview/jobs.json
+  - Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json
+  - Microsoft.Sql/preview/2017-03-01-preview/ManagedBackupShortTermRetention.json
+  - Microsoft.Sql/preview/2017-03-01-preview/ManagedRestorableDroppedDatabaseBackupShortTermRetenion.json
+  - Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
+  - Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
+  - Microsoft.Sql/preview/2017-03-01-preview/serverSecurityAlertPolicies.json
+  - Microsoft.Sql/preview/2017-03-01-preview/restorableDroppedManagedDatabases.json
+  - Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
+  - Microsoft.Sql/preview/2017-03-01-preview/ManagedDatabaseSecurityAlertPolicies.json
+  - Microsoft.Sql/preview/2017-03-01-preview/ManagedServerSecurityAlertPolicy.json
+  - Microsoft.Sql/preview/2017-03-01-preview/SensitivityLabels.json
+  - Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json
+  - Microsoft.Sql/preview/2017-03-01-preview/renameDatabase.json
+  - Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json
+  - Microsoft.Sql/preview/2017-03-01-preview/dataWarehouseUserActivities.json
+  - Microsoft.Sql/preview/2017-03-01-preview/managedDatabases.json
   - ./Microsoft.Sql/preview/2017-03-01-preview/blobAuditing.json
   - ./Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json
   - ./Microsoft.Sql/preview/2017-03-01-preview/databases.json
@@ -177,6 +198,30 @@ input-file:
   - ./Microsoft.Sql/preview/2017-03-01-preview/ManagedServerSecurityAlertPolicy.json
   - ./Microsoft.Sql/preview/2017-03-01-preview/SensitivityLabels.json
   - ./Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json
+
+```
+
+### Tag: schema-sql-2015-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2015-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json
+  - Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json
+  - Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json
+  - Microsoft.Sql/preview/2015-05-01-preview/operations.json
+  - Microsoft.Sql/preview/2015-05-01-preview/serverKeys.json
+  - Microsoft.Sql/preview/2015-05-01-preview/syncAgents.json
+  - Microsoft.Sql/preview/2015-05-01-preview/usages.json
+  - Microsoft.Sql/preview/2015-05-01-preview/virtualclusters.json
+  - Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json
+  - Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json
+  - Microsoft.Sql/preview/2015-05-01-preview/servers.json
+  - Microsoft.Sql/preview/2015-05-01-preview/syncGroups.json
+  - Microsoft.Sql/preview/2015-05-01-preview/syncMembers.json
+  - Microsoft.Sql/preview/2015-05-01-preview/blobAuditing.json
   - ./Microsoft.Sql/preview/2015-05-01-preview/advisors.json
   - ./Microsoft.Sql/preview/2015-05-01-preview/blobAuditing.json
   - ./Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json
@@ -193,6 +238,48 @@ input-file:
   - ./Microsoft.Sql/preview/2015-05-01-preview/usages.json
   - ./Microsoft.Sql/preview/2015-05-01-preview/virtualclusters.json
   - ./Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json
+
+```
+
+### Tag: schema-sql-2015-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2015-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/stable/2015-05-01/capabilities.json
+
+```
+
+### Tag: schema-sql-2014-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-sql-2014-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Sql/stable/2014-04-01/backups.json
+  - Microsoft.Sql/stable/2014-04-01/connectionPolicies.json
+  - Microsoft.Sql/stable/2014-04-01/databaseSecurityAlertPolicies.json
+  - Microsoft.Sql/stable/2014-04-01/dataMasking.json
+  - Microsoft.Sql/stable/2014-04-01/firewallRules.json
+  - Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json
+  - Microsoft.Sql/stable/2014-04-01/metrics.json
+  - Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json
+  - Microsoft.Sql/stable/2014-04-01/replicationLinks.json
+  - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json
+  - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json
+  - Microsoft.Sql/stable/2014-04-01/sql.core.json
+  - Microsoft.Sql/stable/2014-04-01/usages.json
+  - Microsoft.Sql/stable/2014-04-01/capabilities.json
+  - Microsoft.Sql/stable/2014-04-01/databases.json
+  - Microsoft.Sql/stable/2014-04-01/elasticPools.json
+  - Microsoft.Sql/stable/2014-04-01/importExport.json
+  - Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json
+  - Microsoft.Sql/stable/2014-04-01/checkNameAvailability.json
+  - Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json
+  - Microsoft.Sql/stable/2014-04-01/restorePoints.json
   - ./Microsoft.Sql/stable/2014-04-01/advisors.json
   - ./Microsoft.Sql/stable/2014-04-01/backups.json
   - ./Microsoft.Sql/stable/2014-04-01/capabilities.json
@@ -221,4 +308,4 @@ input-file:
   - ./Microsoft.Sql/stable/2014-04-01/tableAuditing.json
   - ./Microsoft.Sql/stable/2014-04-01/usages.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md
index 63e46346db92..3dc1863114f4 100644
--- a/specification/sql/resource-manager/readme.md
+++ b/specification/sql/resource-manager/readme.md
@@ -943,6 +943,8 @@ input-file:
   - $(this-folder)/./Microsoft.Sql/preview/2020-02-02-preview/operations.json
   - $(this-folder)/./Microsoft.Sql/preview/2020-02-02-preview/managedDatabases.json
   - $(this-folder)/./Microsoft.Sql/preview/2020-02-02-preview/managedInstances.json
+  - $(this-folder)/./Microsoft.Sql/preview/2020-02-02-preview/ServerAzureADOnlyAuthentications.json
+  - $(this-folder)/./Microsoft.Sql/preview/2020-02-02-preview/ManagedInstanceAzureADOnlyAuthentications.json
   - $(this-folder)/./Microsoft.Sql/preview/2019-06-01-preview/databases.json
   - $(this-folder)/./Microsoft.Sql/preview/2019-06-01-preview/managedDatabases.json
   - $(this-folder)/./Microsoft.Sql/preview/2019-06-01-preview/serverOperations.json
diff --git a/specification/sqlvirtualmachine/resource-manager/readme.azureresourceschema.md b/specification/sqlvirtualmachine/resource-manager/readme.azureresourceschema.md
index 9c5d3f1a992b..0d9c79d76850 100644
--- a/specification/sqlvirtualmachine/resource-manager/readme.azureresourceschema.md
+++ b/specification/sqlvirtualmachine/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-sqlvirtualmachine-2017-03-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-sqlvirtualmachine-2017-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-sqlvirtualmachine-2017-03-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.SqlVirtualMachine/preview/2017-03-01-preview/sqlvm.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/storSimple1200Series/resource-manager/readme.azureresourceschema.md b/specification/storSimple1200Series/resource-manager/readme.azureresourceschema.md
index 7a25716e59ea..bb72935f7dd8 100644
--- a/specification/storSimple1200Series/resource-manager/readme.azureresourceschema.md
+++ b/specification/storSimple1200Series/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-storsimple-2016-10-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-storsimple-2016-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storsimple-2016-10-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.StorSimple/stable/2016-10-01/StorSimple.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/storage/resource-manager/readme.azureresourceschema.md b/specification/storage/resource-manager/readme.azureresourceschema.md
index 88ef2429498d..4ecf6047074d 100644
--- a/specification/storage/resource-manager/readme.azureresourceschema.md
+++ b/specification/storage/resource-manager/readme.azureresourceschema.md
@@ -5,36 +5,175 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-storage-2019-06-01
+  - tag: schema-storage-2019-04-01
+  - tag: schema-storage-2018-11-01
+  - tag: schema-storage-2018-07-01
+  - tag: schema-storage-2018-03-01-preview
+  - tag: schema-storage-2018-02-01
+  - tag: schema-storage-2017-10-01
+  - tag: schema-storage-2017-06-01
+  - tag: schema-storage-2016-12-01
+  - tag: schema-storage-2016-05-01
+  - tag: schema-storage-2016-01-01
+  - tag: schema-storage-2015-06-15
+  - tag: schema-storage-2015-05-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-storage-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2019-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Storage/stable/2019-06-01/storage.json
   - Microsoft.Storage/stable/2019-06-01/blob.json
   - Microsoft.Storage/stable/2019-06-01/file.json
   - Microsoft.Storage/stable/2019-06-01/queue.json
   - Microsoft.Storage/stable/2019-06-01/table.json
+
+```
+
+### Tag: schema-storage-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2019-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2019-04-01/storage.json
   - Microsoft.Storage/stable/2019-04-01/blob.json
   - Microsoft.Storage/stable/2019-04-01/file.json
+
+```
+
+### Tag: schema-storage-2018-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2018-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2018-11-01/storage.json
   - Microsoft.Storage/stable/2018-11-01/blob.json
+
+```
+
+### Tag: schema-storage-2018-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2018-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2018-07-01/storage.json
   - Microsoft.Storage/stable/2018-07-01/blob.json
+
+```
+
+### Tag: schema-storage-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/preview/2018-03-01-preview/managementpolicy.json
   - Microsoft.Storage/preview/2018-03-01-preview/storage.json
   - Microsoft.Storage/preview/2018-03-01-preview/blob.json
+
+```
+
+### Tag: schema-storage-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2018-02-01/storage.json
   - Microsoft.Storage/stable/2018-02-01/blob.json
+
+```
+
+### Tag: schema-storage-2017-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2017-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2017-10-01/storage.json
+
+```
+
+### Tag: schema-storage-2017-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2017-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2017-06-01/storage.json
+
+```
+
+### Tag: schema-storage-2016-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2016-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2016-12-01/storage.json
+
+```
+
+### Tag: schema-storage-2016-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2016-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2016-05-01/storage.json
+
+```
+
+### Tag: schema-storage-2016-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2016-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2016-01-01/storage.json
+
+```
+
+### Tag: schema-storage-2015-06-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2015-06-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/stable/2015-06-15/storage.json
+
+```
+
+### Tag: schema-storage-2015-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-storage-2015-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Storage/preview/2015-05-01-preview/storage.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/storagecache/resource-manager/readme.azureresourceschema.md b/specification/storagecache/resource-manager/readme.azureresourceschema.md
index 4fe222feabde..c394c65e7d10 100644
--- a/specification/storagecache/resource-manager/readme.azureresourceschema.md
+++ b/specification/storagecache/resource-manager/readme.azureresourceschema.md
@@ -5,15 +5,44 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-storagecache-2020-03-01
+  - tag: schema-storagecache-2019-11-01
+  - tag: schema-storagecache-2019-08-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-storagecache-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagecache-2020-03-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.StorageCache/stable/2020-03-01/storagecache.json
+
+```
+
+### Tag: schema-storagecache-2019-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagecache-2019-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageCache/stable/2019-11-01/storagecache.json
+
+```
+
+### Tag: schema-storagecache-2019-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagecache-2019-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/storageimportexport/resource-manager/readme.azureresourceschema.md b/specification/storageimportexport/resource-manager/readme.azureresourceschema.md
index 5f18dfdfc36f..0ede3bc1f2cb 100644
--- a/specification/storageimportexport/resource-manager/readme.azureresourceschema.md
+++ b/specification/storageimportexport/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-importexport-2020-08-01
+  - tag: schema-importexport-2016-11-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-importexport-2020-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-importexport-2020-08-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.ImportExport/stable/2016-11-01/storageimportexport.json
   - Microsoft.ImportExport/stable/2020-08-01/storageimportexport.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-importexport-2016-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-importexport-2016-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.ImportExport/stable/2016-11-01/storageimportexport.json
+
+```
diff --git a/specification/storagesync/resource-manager/readme.azureresourceschema.md b/specification/storagesync/resource-manager/readme.azureresourceschema.md
index 1dff00cb867e..f5a8e5da5bbb 100644
--- a/specification/storagesync/resource-manager/readme.azureresourceschema.md
+++ b/specification/storagesync/resource-manager/readme.azureresourceschema.md
@@ -5,21 +5,116 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-storagesync-2020-03-01
+  - tag: schema-storagesync-2019-10-01
+  - tag: schema-storagesync-2019-06-01
+  - tag: schema-storagesync-2019-03-01
+  - tag: schema-storagesync-2019-02-01
+  - tag: schema-storagesync-2018-10-01
+  - tag: schema-storagesync-2018-07-01
+  - tag: schema-storagesync-2018-04-02
+  - tag: schema-storagesync-2017-06-05-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-storagesync-2020-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2020-03-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.StorageSync/stable/2020-03-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2019-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2019-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2019-10-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2019-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2019-06-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2019-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2019-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2019-03-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2019-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2019-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2019-02-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2018-10-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2018-10-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2018-10-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2018-07-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2018-07-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2018-07-01/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2018-04-02 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2018-04-02' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/stable/2018-04-02/storagesync.json
+
+```
+
+### Tag: schema-storagesync-2017-06-05-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-storagesync-2017-06-05-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.StorageSync/preview/2017-06-05-preview/storagesync.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/storsimple8000series/resource-manager/readme.azureresourceschema.md b/specification/storsimple8000series/resource-manager/readme.azureresourceschema.md
index bb9b190467e0..c0317855bfca 100644
--- a/specification/storsimple8000series/resource-manager/readme.azureresourceschema.md
+++ b/specification/storsimple8000series/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-storsimple-2017-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-storsimple-2017-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-storsimple-2017-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.StorSimple/stable/2017-06-01/storsimple.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/streamanalytics/resource-manager/readme.azureresourceschema.md b/specification/streamanalytics/resource-manager/readme.azureresourceschema.md
index 92057a6f5531..66f93a4bf826 100644
--- a/specification/streamanalytics/resource-manager/readme.azureresourceschema.md
+++ b/specification/streamanalytics/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,19 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-streamanalytics-2016-03-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-streamanalytics-2016-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-streamanalytics-2016-03-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.StreamAnalytics/stable/2016-03-01/streamingjobs.json
   - Microsoft.StreamAnalytics/stable/2016-03-01/inputs.json
@@ -19,4 +26,4 @@ input-file:
   - Microsoft.StreamAnalytics/stable/2016-03-01/functions.json
   - Microsoft.StreamAnalytics/stable/2016-03-01/subscriptions.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/subscription/resource-manager/readme.azureresourceschema.md b/specification/subscription/resource-manager/readme.azureresourceschema.md
index 2069a09dfb30..7d8ef12e7540 100644
--- a/specification/subscription/resource-manager/readme.azureresourceschema.md
+++ b/specification/subscription/resource-manager/readme.azureresourceschema.md
@@ -5,21 +5,105 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-subscription-2020-09-01
+  - tag: schema-subscription-2020-01-01
+  - tag: schema-subscription-2019-10-01-preview
+  - tag: schema-subscription-2019-03-01-preview
+  - tag: schema-subscription-2018-11-01-preview
+  - tag: schema-subscription-2018-03-01-preview
+  - tag: schema-subscription-2017-11-01-preview
+  - tag: schema-subscription-2016-06-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-subscription-2020-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2020-09-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.Subscription/stable/2016-06-01/subscriptions.json
   - Microsoft.Subscription/stable/2020-09-01/subscriptions.json
+
+```
+
+### Tag: schema-subscription-2020-01-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2020-01-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Subscription/stable/2020-01-01/subscriptions.json
+
+```
+
+### Tag: schema-subscription-2019-10-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2019-10-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Subscription/preview/2019-10-01-preview/subscriptions.json
+
+```
+
+### Tag: schema-subscription-2019-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2019-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json
+
+```
+
+### Tag: schema-subscription-2018-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2018-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json
+
+```
+
+### Tag: schema-subscription-2018-03-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2018-03-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Subscription/preview/2018-03-01-preview/subscriptions.json
   - Microsoft.Subscription/preview/2018-03-01-preview/operations.json
+
+```
+
+### Tag: schema-subscription-2017-11-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2017-11-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Subscription/preview/2017-11-01-preview/subscriptionDefinitions.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-subscription-2016-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-subscription-2016-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Subscription/stable/2016-06-01/subscriptions.json
+
+```
diff --git a/specification/support/resource-manager/readme.azureresourceschema.md b/specification/support/resource-manager/readme.azureresourceschema.md
index b3247a44c14b..fe16d38b6201 100644
--- a/specification/support/resource-manager/readme.azureresourceschema.md
+++ b/specification/support/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-support-2020-04-01
+  - tag: schema-support-2019-05-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-support-2020-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-support-2020-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Support/stable/2020-04-01/support.json
+
+```
+
+### Tag: schema-support-2019-05-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-support-2019-05-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Support/preview/2019-05-01-preview/support.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/synapse/resource-manager/readme.azureresourceschema.md b/specification/synapse/resource-manager/readme.azureresourceschema.md
index f58ec1a7718c..6921a744f8ed 100644
--- a/specification/synapse/resource-manager/readme.azureresourceschema.md
+++ b/specification/synapse/resource-manager/readme.azureresourceschema.md
@@ -5,12 +5,33 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-synapse-2020-04-01-preview
+  - tag: schema-synapse-2019-06-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-synapse-2020-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-synapse-2020-04-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Synapse/preview/2020-04-01-preview/operations.json
+  - Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json
+  - Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json
+
+```
+
+### Tag: schema-synapse-2019-06-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-synapse-2019-06-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json
   - Microsoft.Synapse/preview/2019-06-01-preview/checkNameAvailability.json
@@ -22,8 +43,5 @@ input-file:
   - Microsoft.Synapse/preview/2019-06-01-preview/privateLinkResources.json
   - Microsoft.Synapse/preview/2019-06-01-preview/privateEndpointConnections.json
   - Microsoft.Synapse/preview/2019-06-01-preview/privatelinkhub.json
-  - Microsoft.Synapse/preview/2020-04-01-preview/operations.json
-  - Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json
-  - Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/timeseriesinsights/resource-manager/readme.azureresourceschema.md b/specification/timeseriesinsights/resource-manager/readme.azureresourceschema.md
index ad050bd5a0cf..297d0aa6a16a 100644
--- a/specification/timeseriesinsights/resource-manager/readme.azureresourceschema.md
+++ b/specification/timeseriesinsights/resource-manager/readme.azureresourceschema.md
@@ -5,16 +5,56 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-timeseriesinsights-2020-05-15
+  - tag: schema-timeseriesinsights-2018-08-15-preview
+  - tag: schema-timeseriesinsights-2017-11-15
+  - tag: schema-timeseriesinsights-2017-02-28-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-timeseriesinsights-2020-05-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-timeseriesinsights-2020-05-15' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json
+
+```
+
+### Tag: schema-timeseriesinsights-2018-08-15-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-timeseriesinsights-2018-08-15-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/timeseriesinsights.json
+
+```
+
+### Tag: schema-timeseriesinsights-2017-11-15 and azureresourceschema
+
+``` yaml $(tag) == 'schema-timeseriesinsights-2017-11-15' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.TimeSeriesInsights/stable/2017-11-15/timeseriesinsights.json
+
+```
+
+### Tag: schema-timeseriesinsights-2017-02-28-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-timeseriesinsights-2017-02-28-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.TimeSeriesInsights/preview/2017-02-28-preview/timeseriesinsights.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/trafficmanager/resource-manager/readme.azureresourceschema.md b/specification/trafficmanager/resource-manager/readme.azureresourceschema.md
index f98f78b66f85..9498db976572 100644
--- a/specification/trafficmanager/resource-manager/readme.azureresourceschema.md
+++ b/specification/trafficmanager/resource-manager/readme.azureresourceschema.md
@@ -5,19 +5,92 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-network-2018-04-01
+  - tag: schema-network-2018-03-01
+  - tag: schema-network-2018-02-01
+  - tag: schema-network-2017-09-01-preview
+  - tag: schema-network-2017-05-01
+  - tag: schema-network-2017-03-01
+  - tag: schema-network-2015-11-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-network-2018-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.Network/stable/2018-04-01/trafficmanager.json
+
+```
+
+### Tag: schema-network-2018-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-03-01/trafficmanager.json
+
+```
+
+### Tag: schema-network-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2018-02-01/trafficmanager.json
+
+```
+
+### Tag: schema-network-2017-09-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-09-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/preview/2017-09-01-preview/trafficmanageranalytics.json
+
+```
+
+### Tag: schema-network-2017-05-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-05-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-05-01/trafficmanager.json
+
+```
+
+### Tag: schema-network-2017-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2017-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2017-03-01/trafficmanager.json
+
+```
+
+### Tag: schema-network-2015-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-network-2015-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Network/stable/2015-11-01/trafficmanager.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/visualstudio/resource-manager/readme.azureresourceschema.md b/specification/visualstudio/resource-manager/readme.azureresourceschema.md
index 4fe421242d98..a232fe5d0363 100644
--- a/specification/visualstudio/resource-manager/readme.azureresourceschema.md
+++ b/specification/visualstudio/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-visualstudio-2014-04-01-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-visualstudio-2014-04-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-visualstudio-2014-04-01-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.VisualStudio/preview/2014-04-01-preview/Csm.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/vmware/resource-manager/readme.azureresourceschema.md b/specification/vmware/resource-manager/readme.azureresourceschema.md
index 7c673102e61c..7d16e23c5336 100644
--- a/specification/vmware/resource-manager/readme.azureresourceschema.md
+++ b/specification/vmware/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-avs-2020-03-20
+  - tag: schema-avs-2019-08-09-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-avs-2020-03-20 and azureresourceschema
+
+``` yaml $(tag) == 'schema-avs-2020-03-20' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.AVS/stable/2020-03-20/vmware.json
+
+```
+
+### Tag: schema-avs-2019-08-09-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-avs-2019-08-09-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.AVS/preview/2019-08-09-preview/vmware.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/vmwarecloudsimple/resource-manager/readme.azureresourceschema.md b/specification/vmwarecloudsimple/resource-manager/readme.azureresourceschema.md
index a94b6f44f0d8..5bfa2dc8a1f1 100644
--- a/specification/vmwarecloudsimple/resource-manager/readme.azureresourceschema.md
+++ b/specification/vmwarecloudsimple/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-vmwarecloudsimple-2019-04-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-vmwarecloudsimple-2019-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-vmwarecloudsimple-2019-04-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.VMwareCloudSimple/stable/2019-04-01/vmwarecloudsimple.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/web/resource-manager/readme.azureresourceschema.md b/specification/web/resource-manager/readme.azureresourceschema.md
index 53934c3764c0..928bcbbd2f3b 100644
--- a/specification/web/resource-manager/readme.azureresourceschema.md
+++ b/specification/web/resource-manager/readme.azureresourceschema.md
@@ -5,18 +5,36 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-web-2020-06-01
+  - tag: schema-web-2019-08-01
+  - tag: schema-web-2018-11-01
+  - tag: schema-web-2018-02-01
+  - tag: schema-web-2016-09-01
+  - tag: schema-web-2016-08-01
+  - tag: schema-web-2016-03-01
+  - tag: schema-web-2015-08-01-preview
+  - tag: schema-web-2015-08-01
+  - tag: schema-domainregistration-2020-06-01
+  - tag: schema-domainregistration-2019-08-01
+  - tag: schema-domainregistration-2018-02-01
+  - tag: schema-domainregistration-2015-04-01
+  - tag: schema-certificateregistration-2020-06-01
+  - tag: schema-certificateregistration-2019-08-01
+  - tag: schema-certificateregistration-2018-02-01
+  - tag: schema-certificateregistration-2015-08-01
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-web-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2020-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
-  - Microsoft.CertificateRegistration/stable/2020-06-01/AppServiceCertificateOrders.json
-  - Microsoft.CertificateRegistration/stable/2020-06-01/CertificateRegistrationProvider.json
-  - Microsoft.DomainRegistration/stable/2020-06-01/Domains.json
-  - Microsoft.DomainRegistration/stable/2020-06-01/TopLevelDomains.json
-  - Microsoft.DomainRegistration/stable/2020-06-01/DomainRegistrationProvider.json
   - Microsoft.Web/stable/2020-06-01/Certificates.json
   - Microsoft.Web/stable/2020-06-01/CommonDefinitions.json
   - Microsoft.Web/stable/2020-06-01/DeletedWebApps.json
@@ -29,11 +47,16 @@ input-file:
   - Microsoft.Web/stable/2020-06-01/AppServiceEnvironments.json
   - Microsoft.Web/stable/2020-06-01/AppServicePlans.json
   - Microsoft.Web/stable/2020-06-01/ResourceHealthMetadata.json
-  - Microsoft.CertificateRegistration/stable/2019-08-01/AppServiceCertificateOrders.json
-  - Microsoft.CertificateRegistration/stable/2019-08-01/CertificateRegistrationProvider.json
-  - Microsoft.DomainRegistration/stable/2019-08-01/Domains.json
-  - Microsoft.DomainRegistration/stable/2019-08-01/TopLevelDomains.json
-  - Microsoft.DomainRegistration/stable/2019-08-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-web-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Web/stable/2019-08-01/Certificates.json
   - Microsoft.Web/stable/2019-08-01/CommonDefinitions.json
   - Microsoft.Web/stable/2019-08-01/DeletedWebApps.json
@@ -46,29 +69,72 @@ input-file:
   - Microsoft.Web/stable/2019-08-01/AppServiceEnvironments.json
   - Microsoft.Web/stable/2019-08-01/AppServicePlans.json
   - Microsoft.Web/stable/2019-08-01/ResourceHealthMetadata.json
-  - Microsoft.CertificateRegistration/stable/2018-02-01/AppServiceCertificateOrders.json
-  - Microsoft.CertificateRegistration/stable/2018-02-01/CertificateRegistrationProvider.json
-  - Microsoft.DomainRegistration/stable/2018-02-01/Domains.json
-  - Microsoft.DomainRegistration/stable/2018-02-01/TopLevelDomains.json
-  - Microsoft.DomainRegistration/stable/2018-02-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-web-2018-11-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2018-11-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Web/stable/2018-11-01/Certificates.json
+  - Microsoft.Web/stable/2018-11-01/WebApps.json
+
+```
+
+### Tag: schema-web-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Web/stable/2018-02-01/CommonDefinitions.json
   - Microsoft.Web/stable/2018-02-01/DeletedWebApps.json
   - Microsoft.Web/stable/2018-02-01/Diagnostics.json
   - Microsoft.Web/stable/2018-02-01/Provider.json
   - Microsoft.Web/stable/2018-02-01/Recommendations.json
   - Microsoft.Web/stable/2018-02-01/ResourceProvider.json
-  - Microsoft.Web/stable/2018-11-01/WebApps.json
   - Microsoft.Web/stable/2018-02-01/AppServiceEnvironments.json
   - Microsoft.Web/stable/2018-02-01/AppServicePlans.json
   - Microsoft.Web/stable/2018-02-01/ResourceHealthMetadata.json
   - Microsoft.Web/stable/2018-02-01/WebApps.json
   - Microsoft.Web/stable/2018-02-01/Certificates.json
-  - Microsoft.CertificateRegistration/stable/2015-08-01/AppServiceCertificateOrders.json
-  - Microsoft.CertificateRegistration/stable/2015-08-01/CertificateRegistrationProvider.json
-  - Microsoft.DomainRegistration/stable/2015-04-01/Domains.json
-  - Microsoft.DomainRegistration/stable/2015-04-01/TopLevelDomains.json
-  - Microsoft.DomainRegistration/stable/2015-04-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-web-2016-09-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2016-09-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Web/stable/2016-09-01/AppServiceEnvironments.json
+  - Microsoft.Web/stable/2016-09-01/AppServicePlans.json
+
+```
+
+### Tag: schema-web-2016-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2016-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Web/stable/2016-08-01/WebApps.json
+
+```
+
+### Tag: schema-web-2016-03-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2016-03-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Web/stable/2016-03-01/Certificates.json
   - Microsoft.Web/stable/2016-03-01/CommonDefinitions.json
   - Microsoft.Web/stable/2016-03-01/DeletedWebApps.json
@@ -77,10 +143,127 @@ input-file:
   - Microsoft.Web/stable/2016-03-01/Recommendations.json
   - Microsoft.Web/stable/2016-03-01/ResourceHealthMetadata.json
   - Microsoft.Web/stable/2016-03-01/ResourceProvider.json
-  - Microsoft.Web/stable/2016-08-01/WebApps.json
-  - Microsoft.Web/stable/2016-09-01/AppServiceEnvironments.json
-  - Microsoft.Web/stable/2016-09-01/AppServicePlans.json
-  - Microsoft.Web/stable/2015-08-01/service.json
+
+```
+
+### Tag: schema-web-2015-08-01-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2015-08-01-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.Web/preview/2015-08-01-preview/logicAppsManagementClient.json
 
-```
\ No newline at end of file
+```
+
+### Tag: schema-web-2015-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-web-2015-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Web/stable/2015-08-01/service.json
+
+```
+
+### Tag: schema-domainregistration-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-domainregistration-2020-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DomainRegistration/stable/2020-06-01/Domains.json
+  - Microsoft.DomainRegistration/stable/2020-06-01/TopLevelDomains.json
+  - Microsoft.DomainRegistration/stable/2020-06-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-domainregistration-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-domainregistration-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DomainRegistration/stable/2019-08-01/Domains.json
+  - Microsoft.DomainRegistration/stable/2019-08-01/TopLevelDomains.json
+  - Microsoft.DomainRegistration/stable/2019-08-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-domainregistration-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-domainregistration-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DomainRegistration/stable/2018-02-01/Domains.json
+  - Microsoft.DomainRegistration/stable/2018-02-01/TopLevelDomains.json
+  - Microsoft.DomainRegistration/stable/2018-02-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-domainregistration-2015-04-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-domainregistration-2015-04-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.DomainRegistration/stable/2015-04-01/Domains.json
+  - Microsoft.DomainRegistration/stable/2015-04-01/TopLevelDomains.json
+  - Microsoft.DomainRegistration/stable/2015-04-01/DomainRegistrationProvider.json
+
+```
+
+### Tag: schema-certificateregistration-2020-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-certificateregistration-2020-06-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CertificateRegistration/stable/2020-06-01/AppServiceCertificateOrders.json
+  - Microsoft.CertificateRegistration/stable/2020-06-01/CertificateRegistrationProvider.json
+
+```
+
+### Tag: schema-certificateregistration-2019-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-certificateregistration-2019-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CertificateRegistration/stable/2019-08-01/AppServiceCertificateOrders.json
+  - Microsoft.CertificateRegistration/stable/2019-08-01/CertificateRegistrationProvider.json
+
+```
+
+### Tag: schema-certificateregistration-2018-02-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-certificateregistration-2018-02-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CertificateRegistration/stable/2018-02-01/AppServiceCertificateOrders.json
+  - Microsoft.CertificateRegistration/stable/2018-02-01/CertificateRegistrationProvider.json
+
+```
+
+### Tag: schema-certificateregistration-2015-08-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-certificateregistration-2015-08-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.CertificateRegistration/stable/2015-08-01/AppServiceCertificateOrders.json
+  - Microsoft.CertificateRegistration/stable/2015-08-01/CertificateRegistrationProvider.json
+
+```
diff --git a/specification/windowsesu/resource-manager/readme.azureresourceschema.md b/specification/windowsesu/resource-manager/readme.azureresourceschema.md
index 525a5ef31c75..f0f98827d2de 100644
--- a/specification/windowsesu/resource-manager/readme.azureresourceschema.md
+++ b/specification/windowsesu/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-windowsesu-2019-09-16-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-windowsesu-2019-09-16-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-windowsesu-2019-09-16-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.WindowsESU/preview/2019-09-16-preview/windowsesu.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/windowsiot/resource-manager/readme.azureresourceschema.md b/specification/windowsiot/resource-manager/readme.azureresourceschema.md
index 29d319ea383c..966d030cedee 100644
--- a/specification/windowsiot/resource-manager/readme.azureresourceschema.md
+++ b/specification/windowsiot/resource-manager/readme.azureresourceschema.md
@@ -5,14 +5,32 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-windowsiot-2019-06-01
+  - tag: schema-windowsiot-2018-02-16-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-windowsiot-2019-06-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-windowsiot-2019-06-01' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.WindowsIoT/stable/2019-06-01/WindowsIotServices.json
+
+```
+
+### Tag: schema-windowsiot-2018-02-16-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-windowsiot-2018-02-16-preview' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
   - Microsoft.WindowsIoT/preview/2018-02-16-preview/WindowsIotServices.json
 
-```
\ No newline at end of file
+```
diff --git a/specification/workloadmonitor/resource-manager/readme.azureresourceschema.md b/specification/workloadmonitor/resource-manager/readme.azureresourceschema.md
index 90f57cda3e7b..eac59f40a454 100644
--- a/specification/workloadmonitor/resource-manager/readme.azureresourceschema.md
+++ b/specification/workloadmonitor/resource-manager/readme.azureresourceschema.md
@@ -5,13 +5,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 ### AzureResourceSchema multi-api
 
 ``` yaml $(azureresourceschema) && $(multiapi)
-# include the azure profile definitions from the standard location
-require: ../../../profiles/readme.md
+batch:
+  - tag: schema-workloadmonitor-2018-08-31-preview
 
+```
+
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+### Tag: schema-workloadmonitor-2018-08-31-preview and azureresourceschema
+
+``` yaml $(tag) == 'schema-workloadmonitor-2018-08-31-preview' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
-# all the input files across all versions
+# all the input files in this apiVersion
 input-file:
   - Microsoft.WorkloadMonitor/preview/2018-08-31-preview/Microsoft.WorkloadMonitor.json
 
-```
\ No newline at end of file
+```