diff --git a/specification/botservice/resource-manager/readme.go.md b/specification/botservice/resource-manager/readme.go.md
index 97433ce5c511..fdb5dda5665c 100644
--- a/specification/botservice/resource-manager/readme.go.md
+++ b/specification/botservice/resource-manager/readme.go.md
@@ -13,11 +13,21 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-preview-2021-05
   - tag: package-2021-03-01
   - tag: package-2017-12-01
   - tag: package-2018-07-12
 ```
 
+### Tag: package-preview-2021-05 and go
+
+These settings apply only when `--tag=package-preview-2021-05 --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-preview-2021-05' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-05-01-preview/$(namespace)
+```
+
 ### Tag: package-2021-03-01 and go
 
 These settings apply only when `--tag=package-2021-03-01 --go` is specified on the command line.
diff --git a/specification/containerinstance/resource-manager/readme.go.md b/specification/containerinstance/resource-manager/readme.go.md
index 0fa166528095..d3a8737b39e8 100644
--- a/specification/containerinstance/resource-manager/readme.go.md
+++ b/specification/containerinstance/resource-manager/readme.go.md
@@ -13,6 +13,7 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-09
   - tag: package-2021-07
   - tag: package-2021-03
   - tag: package-2020-11
@@ -27,6 +28,15 @@ batch:
   - tag: package-2017-08-preview
 ```
 
+### Tag: package-2021-09 and go
+
+These settings apply only when `--tag=package-2021-09 --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-09' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-09-01/$(namespace)
+```
+
 ### Tag: package-2021-07 and go
 
 These settings apply only when `--tag=package-2021-07 --go` is specified on the command line.
diff --git a/specification/iotcentral/resource-manager/readme.go.md b/specification/iotcentral/resource-manager/readme.go.md
index 6ae9907b07b5..d16c4ac2a9e0 100644
--- a/specification/iotcentral/resource-manager/readme.go.md
+++ b/specification/iotcentral/resource-manager/readme.go.md
@@ -13,9 +13,19 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-06
   - tag: package-2018-09-01
 ```
 
+### Tag: package-2021-06 and go
+
+These settings apply only when `--tag=package-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' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-06-01/$(namespace)
+```
+
 ### Tag: package-2018-09-01 and go
 
 These settings apply only when `--tag=package-2018-09-01 --go` is specified on the command line.
diff --git a/specification/synapse/resource-manager/readme.go.md b/specification/synapse/resource-manager/readme.go.md
index 51b3fcb8e52a..e7c9b2a2d0ed 100644
--- a/specification/synapse/resource-manager/readme.go.md
+++ b/specification/synapse/resource-manager/readme.go.md
@@ -13,6 +13,7 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-composite-v2
   - tag: package-composite-v1
   - tag: package-2019-06-01-preview
   - tag: package-2020-12-01
@@ -20,6 +21,15 @@ batch:
   - tag: package-preview-2021-06
 ```
 
+### Tag: package-composite-v2 and go
+
+These settings apply only when `--tag=package-composite-v2 --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-composite-v2' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/v2.0/$(namespace)
+```
+
 ### Tag: package-composite-v1 and go
 
 These settings apply only when `--tag=package-composite-v1 --go` is specified on the command line.
diff --git a/specification/videoanalyzer/resource-manager/readme.go.md b/specification/videoanalyzer/resource-manager/readme.go.md
index 64c3c0f3e35f..0aa5d43a4e95 100644
--- a/specification/videoanalyzer/resource-manager/readme.go.md
+++ b/specification/videoanalyzer/resource-manager/readme.go.md
@@ -13,9 +13,19 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-preview-2021-11
   - tag: package-2021-05-01-preview
 ```
 
+### Tag: package-preview-2021-11 and go
+
+These settings apply only when `--tag=package-preview-2021-11 --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-preview-2021-11' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-11-01-preview/$(namespace)
+```
+
 ### Tag: package-2021-05-01-preview and go
 
 These settings apply only when `--tag=package-2021-05-01-preview --go` is specified on the command line.