diff --git a/specification/automanage/resource-manager/readme.go.md b/specification/automanage/resource-manager/readme.go.md
index 0563de952572..29d344eb3461 100644
--- a/specification/automanage/resource-manager/readme.go.md
+++ b/specification/automanage/resource-manager/readme.go.md
@@ -21,9 +21,19 @@ azure-arm: true
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-04-30-preview
   - tag: package-2020-06-30-preview
 ```
 
+### Tag: package-2021-04-30-preview and go
+
+These settings apply only when `--tag=package-2021-04-30-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-04-30-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-04-30-preview/$(namespace)
+```
+
 ### Tag: package-2020-06-30-preview and go
 
 These settings apply only when `--tag=package-2020-06-30-preview --go` is specified on the command line.
diff --git a/specification/network/resource-manager/readme.go.md b/specification/network/resource-manager/readme.go.md
index b84bb9241290..fd20a8c1a4ad 100644
--- a/specification/network/resource-manager/readme.go.md
+++ b/specification/network/resource-manager/readme.go.md
@@ -23,6 +23,7 @@ azure-arm: true
 batch:
   - tag: package-2021-05
   - tag: package-2021-03
+  - tag: package-2021-03-preview
   - tag: package-2021-02
   - tag: package-2020-11
   - tag: package-2020-08
@@ -80,6 +81,15 @@ Please also specify `--go-sdk-folder=<path to the root directory of your azure-s
 output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-03-01/$(namespace)
 ```
 
+### Tag: package-2021-03-preview and go
+
+These settings apply only when `--tag=package-2021-03-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-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-03-01-preview/$(namespace)
+```
+
 ### Tag: package-2021-02 and go
 
 These settings apply only when `--tag=package-2021-02 --go` is specified on the command line.
diff --git a/specification/recoveryservices/resource-manager/readme.go.md b/specification/recoveryservices/resource-manager/readme.go.md
index 1eab64facfb3..146444147828 100644
--- a/specification/recoveryservices/resource-manager/readme.go.md
+++ b/specification/recoveryservices/resource-manager/readme.go.md
@@ -21,9 +21,19 @@ azure-arm: true
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-08
   - tag: package-2016-06
 ```
 
+### Tag: package-2021-08 and go
+
+These settings apply only when `--tag=package-2021-08 --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-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-08-01/$(namespace)
+```
+
 ### Tag: package-2016-06 and go
 
 These settings apply only when `--tag=package-2016-06 --go` is specified on the command line.