diff --git a/specification/postgresql/resource-manager/readme.go.md b/specification/postgresql/resource-manager/readme.go.md
index d30a6fff9768..cfdb1a52bc58 100644
--- a/specification/postgresql/resource-manager/readme.go.md
+++ b/specification/postgresql/resource-manager/readme.go.md
@@ -12,8 +12,8 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
-  - tag: package-2021-06-01
-  - tag: package-2021-06-01-preview
+  - tag: package-flexibleserver-2021-06
+  - tag: package-flexibleserver-2021-06-preview
   - tag: package-2020-11-05-preview
   - tag: package-2020-02-14-preview
   - tag: package-2020-01-01
@@ -21,23 +21,23 @@ batch:
   - tag: package-2017-12-01
 ```
 
-### Tag: package-2021-06-01 and go
+### Tag: package-flexibleserver-2021-06 and go
 
-These settings apply only when `--tag=package-2021-06-01 --go` is specified on the command line.
+These settings apply only when `--tag=package-flexibleserver-2021-06 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag) == 'package-2021-06-01' && $(go)
+``` yaml $(tag) == 'package-flexibleserver-2021-06' && $(go)
 rpname: postgresql
 namespace: postgresqlflexibleservers
 output-folder: $(go-sdk-folder)/services/$(rpname)/mgmt/2021-06-01/$(namespace)
 ```
 
-### Tag: package-2021-06-01-preview and go
+### Tag: package-flexibleserver-2021-06-preview and go
 
-These settings apply only when `--tag=package-2021-06-01-preview --go` is specified on the command line.
+These settings apply only when `--tag=package-flexibleserver-2021-06-preview --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag) == 'package-2021-06-01-preview' && $(go)
+``` yaml $(tag) == 'package-flexibleserver-2021-06-preview' && $(go)
 rpname: postgresql
 namespace: postgresqlflexibleservers
 output-folder: $(go-sdk-folder)/services/preview/$(rpname)/mgmt/2021-06-01-preview/$(namespace)
diff --git a/specification/postgresql/resource-manager/readme.java.md b/specification/postgresql/resource-manager/readme.java.md
index 134c8d9e3930..4f86b9ad8fd8 100644
--- a/specification/postgresql/resource-manager/readme.java.md
+++ b/specification/postgresql/resource-manager/readme.java.md
@@ -9,6 +9,7 @@ fluent: true
 namespace: com.microsoft.azure.management.postgresql
 license-header: MICROSOFT_MIT_NO_CODEGEN
 payload-flattening-threshold: 1
+tag: package-2020-01-01
 output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-postgresql
 ```
 
diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md
index 99d95d01d698..13a1e3c513bb 100644
--- a/specification/postgresql/resource-manager/readme.md
+++ b/specification/postgresql/resource-manager/readme.md
@@ -28,25 +28,25 @@ These are the global settings for the PostgreSQL API.
 title: PostgreSQLManagementClient
 description: The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, log files and configurations with new business model.
 openapi-type: arm
-tag: package-2020-01-01
+tag: package-flexibleserver-2021-06
 ```
 
-### Tag: package-2021-06-01
+### Tag: package-flexibleserver-2021-06
 
-These settings apply only when `--tag=package-2021-06-01` is specified on the command line.
+These settings apply only when `--tag=package-flexibleserver-2021-06` is specified on the command line.
 
-``` yaml $(tag) == 'package-2021-06-01'
+``` yaml $(tag) == 'package-flexibleserver-2021-06'
 input-file:
 - Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json
 - Microsoft.DBforPostgreSQL/stable/2021-06-01/Databases.json
 - Microsoft.DBforPostgreSQL/stable/2021-06-01/PrivateDnsZone.json
 ```
 
-### Tag: package-2021-06-01-preview
+### Tag: package-flexibleserver-2021-06-preview
 
-These settings apply only when `--tag=package-2021-06-01-preview` is specified on the command line.
+These settings apply only when `--tag=package-flexibleserver-2021-06-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2021-06-01-preview'
+``` yaml $(tag) == 'package-flexibleserver-2021-06-preview'
 input-file:
 - Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json
 - Microsoft.DBforPostgreSQL/preview/2020-11-05-preview/Databases.json
@@ -206,12 +206,10 @@ This is not used by Autorest itself.
 
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
-  - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
-  - repo: azure-sdk-for-node
   - repo: azure-resource-manager-schemas
 ```
 
diff --git a/specification/postgresql/resource-manager/readme.python.md b/specification/postgresql/resource-manager/readme.python.md
index e8f57ea0a499..9866ed04666f 100644
--- a/specification/postgresql/resource-manager/readme.python.md
+++ b/specification/postgresql/resource-manager/readme.python.md
@@ -13,36 +13,22 @@ package-version: 1.0.0b1
 no-namespace-folders: true
 ```
 
-### Python multi-api
-
-Generate all API versions currently shipped for this package
-
-```yaml $(track2)
-clear-output-folder: true
-batch:
-  - tag: package-2021-06-01
-  - tag: package-2021-06-01-preview
-  - tag: package-2020-01-01
-  - tag: package-2020-11-05-preview
-  - tag: package-2021-03-31-privatepreview
-```
-
-### Tag: package-2021-06-01 and python
+### Tag: package-flexibleserver-2021-06 and python
 
-These settings apply only when `--tag=package-2021-06-01 --python` is specified on the command line.
+These settings apply only when `--tag=package-flexibleserver-2021-06 --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-2021-06-01' && $(python)
+``` yaml $(tag) == 'package-flexibleserver-2021-06' && $(python)
 namespace: azure.mgmt.rdbms.postgresql_flexibleservers
 output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers
 ```
 
-### Tag: package-2021-06-01-preview and python
+### Tag: package-flexibleserver-2021-06-preview and python
 
-These settings apply only when `--tag=package-2021-06-01-preview --python` is specified on the command line.
+These settings apply only when `--tag=package-flexibleserver-2021-06 --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-2021-06-01-preview' && $(python)
+``` yaml $(tag) == 'package-flexibleserver-2021-06-preview' && $(python)
 namespace: azure.mgmt.rdbms.postgresql_flexibleservers
 output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers
 ```
diff --git a/specification/postgresql/resource-manager/readme.typescript.md b/specification/postgresql/resource-manager/readme.typescript.md
index 610f791239cb..a03cbf20eb5d 100644
--- a/specification/postgresql/resource-manager/readme.typescript.md
+++ b/specification/postgresql/resource-manager/readme.typescript.md
@@ -10,6 +10,28 @@ typescript:
   generate-metadata: true
 ```
 
+### Tag: package-flexibleserver-2021-06 and TypeScript
+
+These settings apply only when `--tag=package-flexibleserver-2021-06 --typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to the root directory of your azure-sdk-for-typescript clone>`.
+
+``` yaml $(tag) == 'package-flexibleserver-2021-06' && $(typescript)
+title: PostgreSQLManagementFlexibleServerClient
+package-name: "@azure/arm-postgresql-flexible"
+output-folder: "$(typescript-sdks-folder)/sdk/postgresql/arm-postgresql-flexible/"
+```
+
+### Tag: package-flexibleserver-2021-06-preview and TypeScript
+
+These settings apply only when `--tag=package-flexibleserver-2021-06-preview --typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to the root directory of your azure-sdk-for-typescript clone>`.
+
+``` yaml $(tag) == 'package-flexibleserver-2021-06-preview' && $(typescript)
+title: PostgreSQLManagementFlexibleServerClient
+package-name: "@azure/arm-postgresql-flexible"
+output-folder: "$(typescript-sdks-folder)/sdk/postgresql/arm-postgresql-flexible/"
+```
+
 ### Tag: package-2021-04-10-privatepreview and TypeScript
 
 These settings apply only when `--tag=package-2021-04-10-privatepreview --typescript` is specified on the command line.