diff --git a/specification/containerregistry/resource-manager/readme.md b/specification/containerregistry/resource-manager/readme.md
index 7a9e8e0295ce..81784d6809f4 100644
--- a/specification/containerregistry/resource-manager/readme.md
+++ b/specification/containerregistry/resource-manager/readme.md
@@ -28,6 +28,14 @@ These are the global settings for the ContainerRegistry API.
 openapi-type: arm
 tag: package-2020-11-preview
 ```
+### Tag: package-2020-11-preview-only
+
+These settings apply only when `--tag=package-2020-11-preview-only` is specified on the command line.
+
+```yaml $(tag) == 'package-2020-11-preview-only'
+input-file:
+  - Microsoft.ContainerRegistry/preview/2020-11-01-preview/containerregistry.json
+```
 
 ### Tag: package-2020-11-preview
 
@@ -39,6 +47,15 @@ input-file:
   - Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
 ```
 
+### Tag: package-2019-12-preview-only
+
+These settings apply only when `--tag=package-2019-12-preview-only` is specified on the command line.
+
+```yaml $(tag) == 'package-2019-12-preview-only'
+input-file:
+  - Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
+```
+
 ### Tag: package-2019-12-preview
 
 These settings apply only when `--tag=package-2019-12-preview` is specified on the command line.
@@ -70,6 +87,15 @@ input-file:
 - Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
 ```
 
+### Tag: package-2019-05-only
+
+These settings apply only when `--tag=package-2019-05-only` is specified on the command line.
+
+``` yaml $(tag) == 'package-2019-05-only'
+input-file:
+- Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json
+```
+
 ### Tag: package-2019-05
 
 These settings apply only when `--tag=package-2019-05` is specified on the command line.
@@ -80,6 +106,15 @@ input-file:
 - Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json
 ```
 
+### Tag: package-2019-05-preview-only
+
+These settings apply only when `--tag=package-2019-05-preview-only` is specified on the command line.
+
+``` yaml $(tag) == 'package-2019-05-preview-only'
+input-file:
+- Microsoft.ContainerRegistry/preview/2019-05-01-preview/containerregistry_scopemap.json
+```
+
 ### Tag: package-2019-05-preview
 
 These settings apply only when `--tag=package-2019-05-preview` is specified on the command line.
@@ -109,6 +144,15 @@ input-file:
 - Microsoft.ContainerRegistry/stable/2019-04-01/containerregistry_build.json
 ```
 
+### Tag: package-2018-09-only
+
+These settings apply only when `--tag=package-2018-09-only` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-09-only'
+input-file:
+- Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
+```
+
 ### Tag: package-2018-09
 
 These settings apply only when `--tag=package-2018-09` is specified on the command line.
@@ -119,6 +163,15 @@ input-file:
 - Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
 ```
 
+### Tag: package-2018-02-preview-only
+
+These settings apply only when `--tag=package-2018-02-preview-only` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-02-preview-only'
+input-file:
+- Microsoft.ContainerRegistry/preview/2018-02-01-preview/containerregistry_build.json
+```
+
 ### Tag: package-2018-02-preview
 
 These settings apply only when `--tag=package-2018-02-preview` is specified on the command line.
@@ -183,6 +236,7 @@ swagger-to-sdk:
     after_scripts:
       - python ./scripts/multiapi_init_gen.py azure-mgmt-containerregistry
       - python ./scripts/trim_aio.py ./sdk/containerregistry/azure-mgmt-containerregistry
+  - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
@@ -211,6 +265,9 @@ csharp:
   output-folder: $(csharp-sdks-folder)/containerregistry/Microsoft.Azure.Management.ContainerRegistry/src/Generated
   clear-output-folder: true
 ```
+## Pyhton
+
+See configuration in [readme.python.md](./readme.python.md)
 
 ## Go
 
diff --git a/specification/containerregistry/resource-manager/readme.python.md b/specification/containerregistry/resource-manager/readme.python.md
index ef94bd693666..6cab3774be2b 100644
--- a/specification/containerregistry/resource-manager/readme.python.md
+++ b/specification/containerregistry/resource-manager/readme.python.md
@@ -2,7 +2,7 @@
 
 These settings apply only when `--python` is specified on the command line.
 
-```yaml $(python)
+```yaml $(python) && !$(track2)
 python:
   azure-arm: true
   license-header: MICROSOFT_MIT_NO_VERSION
@@ -12,11 +12,20 @@ python:
   no-namespace-folders: true
 ```
 
+```yaml $(python) && $(track2)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+package-name: azure-mgmt-containerregistry
+clear-output-folder: true
+package-version: 1.0.0b1
+no-namespace-folders: true
+```
+
 ### Python multi-api
 
 Generate all API versions currently shipped for this package
 
-```yaml $(python) && $(multiapi)
+```yaml $(python) && $(multiapi) && !$(track2)
 batch:
   - tag: package-2020-11-preview
   - tag: package-2019-12-preview
@@ -30,6 +39,40 @@ batch:
   - tag: package-2017-03
 ```
 
+```yaml $(python) && $(multiapi) && $(track2)
+clear-output-folder: true
+batch:
+  - tag: package-2020-11-preview-only
+  - tag: package-2019-12-preview-only
+  - tag: package-2019-06-preview-only
+  - tag: package-2019-05-only
+  - tag: package-2019-05-preview-only
+  - tag: package-2019-04-only
+  - tag: package-2018-09-only
+  - tag: package-2018-02-preview-only
+  - tag: package-2017-10
+  - tag: package-2017-03
+  - multiapiscript: true
+```
+
+``` yaml $(multiapiscript)
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/
+clear-output-folder: false
+perform-load: false
+```
+### Tag: package-2020-11-preview-only and python
+
+These settings apply only when `--tag=package-2020-11-preview-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2020-11-preview-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2020_11_01_preview
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview
+namespace: azure.mgmt.containerregistry.v2020_11_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview
+```
+
 ### Tag: package-2020-11-preview and python
 
 These settings apply only when `--tag=package-2020-11-preview --python` is specified on the command line.
@@ -39,6 +82,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2020_11_01_preview
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview
+namespace: azure.mgmt.containerregistry.v2020_11_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview
+```
+
+### Tag: package-2019-12-preview-only and python
+
+These settings apply only when `--tag=package-2019-12-preview-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2019-12-preview-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2019_12_01_preview
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview
+namespace: azure.mgmt.containerregistry.v2019_12_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview
 ```
 
 ### Tag: package-2019-12-preview and python
@@ -50,6 +108,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2019_12_01_preview
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview
+namespace: azure.mgmt.containerregistry.v2019_12_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview
+```
+
+### Tag: package-2019-06-preview-only and python
+
+These settings apply only when `--tag=package-2019-06-preview-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2019-06-preview-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2019_06_01_preview
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview
+namespace: azure.mgmt.containerregistry.v2019_06_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview
 ```
 
 ### Tag: package-2019-06-preview and python
@@ -61,6 +134,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2019_06_01_preview
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview
+namespace: azure.mgmt.containerregistry.v2019_06_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview
+```
+
+### Tag: package-2019-05-only and python
+
+These settings apply only when `--tag=package-2019-05-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2019-05-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2019_05_01
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01
+namespace: azure.mgmt.containerregistry.v2019_05_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01
 ```
 
 ### Tag: package-2019-05 and python
@@ -72,6 +160,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2019_05_01
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01
+namespace: azure.mgmt.containerregistry.v2019_05_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01
+```
+
+### Tag: package-2019-05-preview-only and python
+
+These settings apply only when `--tag=package-2019-05-preview-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2019-05-preview-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2019_05_01_preview
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview
+namespace: azure.mgmt.containerregistry.v2019_05_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview
 ```
 
 ### Tag: package-2019-05-preview and python
@@ -83,6 +186,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2019_05_01_preview
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview
+namespace: azure.mgmt.containerregistry.v2019_05_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview
+```
+
+### Tag: package-2019-04-only and python
+
+These settings apply only when `--tag=package-2019-04-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2019-04-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2019_04_01
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_04_01
+namespace: azure.mgmt.containerregistry.v2019_04_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_04_01
 ```
 
 ### Tag: package-2019-04 and python
@@ -94,6 +212,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2019_04_01
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_04_01
+namespace: azure.mgmt.containerregistry.v2019_04_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_04_01
+```
+
+### Tag: package-2018-09-only and python
+
+These settings apply only when `--tag=package-2018-09-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2018-09-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2018_09_01
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01
+namespace: azure.mgmt.containerregistry.v2018_09_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01
 ```
 
 ### Tag: package-2018-09 and python
@@ -105,6 +238,21 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2018_09_01
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01
+namespace: azure.mgmt.containerregistry.v2018_09_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01
+```
+
+### Tag: package-2018-02-preview-only and python
+
+These settings apply only when `--tag=package-2018-02-preview-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2018-02-preview-only' && $(python)
+python:
+  namespace: azure.mgmt.containerregistry.v2018_02_01_preview
+  output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview
+namespace: azure.mgmt.containerregistry.v2018_02_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview
 ```
 
 ### Tag: package-2018-02-preview and python
@@ -116,6 +264,8 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2018_02_01_preview
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview
+namespace: azure.mgmt.containerregistry.v2018_02_01_preview
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview
 ```
 
 ### Tag: package-2017-10 and python
@@ -127,6 +277,8 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2017_10_01
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01
+namespace: azure.mgmt.containerregistry.v2017_10_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01
 ```
 
 ### Tag: package-2017-03 and python
@@ -138,4 +290,35 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 python:
   namespace: azure.mgmt.containerregistry.v2017_03_01
   output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_03_01
+namespace: azure.mgmt.containerregistry.v2017_03_01
+output-folder: $(python-sdks-folder)/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_03_01
 ```
+
+
+``` yaml $(python) && $(track2)
+directive:
+  - from: swagger-document
+    where: $.definitions.BuildStepProperties
+    transform: >
+        $['required'] = ['type'];
+  - from: swagger-document
+    where: $.definitions.BuildStepPropertiesUpdateParameters
+    transform: >
+        $['required'] = ['type'];
+  - from: swagger-document
+    where: $.definitions.QueueBuildRequest
+    transform: >
+        $['required'] = ['type']; 
+  - from: swagger-document
+    where: $.definitions.RunRequest
+    transform: >
+        $['required'] = ['type'];
+  - from: swagger-document
+    where: $.definitions.TaskStepProperties
+    transform: >
+        $['required'] = ['type']; 
+  - from: swagger-document
+    where: $.definitions.TaskStepUpdateParameters
+    transform: >
+        $['required'] = ['type'];
+```
\ No newline at end of file