diff --git a/specification/dnc/resource-manager/readme.python.md b/specification/dnc/resource-manager/readme.python.md
index 5f6142a1f507..27858cf194a5 100644
--- a/specification/dnc/resource-manager/readme.python.md
+++ b/specification/dnc/resource-manager/readme.python.md
@@ -3,21 +3,16 @@
 These settings apply only when `--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 $(track2)
+``` yaml $(python)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 package-name: azure-mgmt-dnc
-no-namespace-folders: true
+namespace: azure.mgmt.dnc
 package-version: 1.0.0b1
 clear-output-folder: true
 ```
 
-``` yaml $(python-mode) == 'update' && $(track2)
+``` yaml $(python)
 no-namespace-folders: true
 output-folder: $(python-sdks-folder)/dnc/azure-mgmt-dnc/azure/mgmt/dnc
 ```
-
-``` yaml $(python-mode) == 'create' && $(track2)
-basic-setup-py: true
-output-folder: $(python-sdks-folder)/dnc/azure-mgmt-dnc
-```
diff --git a/specification/hardwaresecuritymodules/resource-manager/readme.md b/specification/hardwaresecuritymodules/resource-manager/readme.md
index 008c32e5ed70..1d27b87838c9 100644
--- a/specification/hardwaresecuritymodules/resource-manager/readme.md
+++ b/specification/hardwaresecuritymodules/resource-manager/readme.md
@@ -62,6 +62,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-cli-extensions
+  - repo: azure-sdk-for-python-track2
   - repo: azure-resource-manager-schemas
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-go-track2
diff --git a/specification/hardwaresecuritymodules/resource-manager/readme.python.md b/specification/hardwaresecuritymodules/resource-manager/readme.python.md
index 3c0fe4da6616..c30eaad4f126 100644
--- a/specification/hardwaresecuritymodules/resource-manager/readme.python.md
+++ b/specification/hardwaresecuritymodules/resource-manager/readme.python.md
@@ -4,22 +4,15 @@ These settings apply only when `--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 $(python)
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: azure.mgmt.hardwaresecuritymodules
-  package-name: azure-mgmt-hardwaresecuritymodules
-  package-version: 2019-05-01
-  clear-output-folder: true
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+namespace: azure.mgmt.hardwaresecuritymodules
+package-name: azure-mgmt-hardwaresecuritymodules
+package-version: 2019-05-01
+clear-output-folder: true
 ```
 
-``` yaml $(python) && $(python-mode) == 'update'
-python:
-  no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/hardwaresecuritymodules/azure-mgmt-hardwaresecuritymodules/azure/mgmt/hardwaresecuritymodules
-```
-``` yaml $(python) && $(python-mode) == 'create'
-python:
-  basic-setup-py: true
-  output-folder: $(python-sdks-folder)/hardwaresecuritymodules/azure-mgmt-hardwaresecuritymodules
+``` yaml $(python)
+no-namespace-folders: true
+output-folder: $(python-sdks-folder)/hardwaresecuritymodules/azure-mgmt-hardwaresecuritymodules/azure/mgmt/hardwaresecuritymodules
 ```
\ No newline at end of file
diff --git a/specification/hybridconnectivity/resource-manager/readme.md b/specification/hybridconnectivity/resource-manager/readme.md
index a7c986f34fc0..dd8f9990b569 100644
--- a/specification/hybridconnectivity/resource-manager/readme.md
+++ b/specification/hybridconnectivity/resource-manager/readme.md
@@ -52,7 +52,6 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python-track2
-  - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-go-track2
diff --git a/specification/hybridconnectivity/resource-manager/readme.python.md b/specification/hybridconnectivity/resource-manager/readme.python.md
index 5cf6d5378b3e..e375b3f63d68 100644
--- a/specification/hybridconnectivity/resource-manager/readme.python.md
+++ b/specification/hybridconnectivity/resource-manager/readme.python.md
@@ -3,21 +3,16 @@
 These settings apply only when `--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 $(track2)
+``` yaml $(python)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 package-name: azure-mgmt-hybridconnectivity
-no-namespace-folders: true
+namespace: azure.mgmt.hybridconnectivity
 package-version: 1.0.0b1
 clear-output-folder: true
 ```
 
-``` yaml $(python-mode) == 'update' && $(track2)
+``` yaml $(python)
 no-namespace-folders: true
 output-folder: $(python-sdks-folder)/hybridconnectivity/azure-mgmt-hybridconnectivity/azure/mgmt/hybridconnectivity
 ```
-
-``` yaml $(python-mode) == 'create' && $(track2)
-basic-setup-py: true
-output-folder: $(python-sdks-folder)/hybridconnectivity/azure-mgmt-hybridconnectivity
-```
diff --git a/specification/hybridkubernetes/resource-manager/readme.python.md b/specification/hybridkubernetes/resource-manager/readme.python.md
index 8bb6e85d5816..188efb2cb731 100644
--- a/specification/hybridkubernetes/resource-manager/readme.python.md
+++ b/specification/hybridkubernetes/resource-manager/readme.python.md
@@ -4,20 +4,16 @@ These settings apply only when `--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>`.
 Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
 
-```yaml $(python) && $(track2)
+```yaml $(python)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 package-name: azure-mgmt-hybridkubernetes
-no-namespace-folders: true
+namespace: azure.mgmt.hybridkubernetes
 package-version: 1.0.0b1
 clear-output-folder: true
 ```
 
-``` yaml $(python) && $(python-mode) == 'update' && $(track2)
+``` yaml $(python)
 no-namespace-folders: true
 output-folder: $(python-sdks-folder)/hybridkubernetes/azure-mgmt-hybridkubernetes/azure/mgmt/hybridkubernetes
 ```
-``` yaml $(python) && $(python-mode) == 'create' && $(track2)
-basic-setup-py: true
-output-folder: $(python-sdks-folder)/hybridkubernetes/azure-mgmt-hybridkubernetes
-```
diff --git a/specification/m365securityandcompliance/resource-manager/readme.md b/specification/m365securityandcompliance/resource-manager/readme.md
index cee7c6adb63f..d8898f6c34e0 100644
--- a/specification/m365securityandcompliance/resource-manager/readme.md
+++ b/specification/m365securityandcompliance/resource-manager/readme.md
@@ -62,7 +62,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-go-track2
   - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
-  - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-python-track2
   - repo: azure-resource-manager-schemas
 ```
 
diff --git a/specification/m365securityandcompliance/resource-manager/readme.python.md b/specification/m365securityandcompliance/resource-manager/readme.python.md
index 52bf45542a48..47640816bf78 100644
--- a/specification/m365securityandcompliance/resource-manager/readme.python.md
+++ b/specification/m365securityandcompliance/resource-manager/readme.python.md
@@ -5,23 +5,15 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
 
 ``` yaml $(python)
-python-mode: create
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-  namespace: azure.mgmt.m365securityandcompliance
-  package-name: azure-mgmt-m365securityandcompliance
-  package-version: 2.0.0
-  clear-output-folder: true
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+payload-flattening-threshold: 2
+namespace: azure.mgmt.m365securityandcompliance
+package-name: azure-mgmt-m365securityandcompliance
+package-version: 2.0.0
+clear-output-folder: true
 ```
-``` yaml $(python) && $(python-mode) == 'update'
-python:
-  no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/m365securityandcompliance/azure-mgmt-m365securityandcompliance/azure/mgmt/m365securityandcompliance
-```
-``` yaml $(python) && $(python-mode) == 'create'
-python:
-  basic-setup-py: true
-  output-folder: $(python-sdks-folder)/m365securityandcompliance/azure-mgmt-m365securityandcompliance
+``` yaml $(python)
+no-namespace-folders: true
+output-folder: $(python-sdks-folder)/m365securityandcompliance/azure-mgmt-m365securityandcompliance/azure/mgmt/m365securityandcompliance
 ```