diff --git a/specification/maps/resource-manager/readme.go.md b/specification/maps/resource-manager/readme.go.md
index 07e01372db39..d91b1d0988a4 100644
--- a/specification/maps/resource-manager/readme.go.md
+++ b/specification/maps/resource-manager/readme.go.md
@@ -13,11 +13,21 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-02
   - tag: package-2018-05
   - tag: package-2017-01
   - tag: package-preview-2020-02
 ```
 
+### Tag: package-2021-02 and go
+
+These settings apply only when `--tag=package-2021-02 --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-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-02-01/$(namespace)
+```
+
 ### Tag: package-preview-2020-02 and go
 
 These settings apply only when `--tag=package-preview-2020-02 --go` is specified on the command line.
diff --git a/specification/mediaservices/resource-manager/readme.go.md b/specification/mediaservices/resource-manager/readme.go.md
index b94988bf73d3..c788504d54bf 100644
--- a/specification/mediaservices/resource-manager/readme.go.md
+++ b/specification/mediaservices/resource-manager/readme.go.md
@@ -13,6 +13,7 @@ go:
 
 ```yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-05
   - tag: package-2020-05
   - tag: package-2015-10
   - tag: package-2018-03-preview
@@ -21,6 +22,15 @@ batch:
   - tag: package-2019-05-preview
 ```
 
+### Tag: package-2021-05 and go
+
+These settings apply only when `--tag=package-2021-05 --go` is specified on the command line.
+Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2021-05' && $(go)
+output-folder: $(go-sdk-folder)/services/mediaservices/mgmt/2021-05-01/$(namespace)
+```
+
 ### Tag: package-2020-05 and go
 
 These settings apply only when `--tag=package-2020-05 --go` is specified on the command line.
diff --git a/specification/resourcegraph/resource-manager/readme.go.md b/specification/resourcegraph/resource-manager/readme.go.md
index 4fcaee72cc1c..15ee848a9a4d 100644
--- a/specification/resourcegraph/resource-manager/readme.go.md
+++ b/specification/resourcegraph/resource-manager/readme.go.md
@@ -13,11 +13,21 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-preview-2021-03
   - tag: package-2021-03
   - tag: package-2019-04
   - tag: package-2018-09-preview
 ```
 
+### Tag: package-preview-2021-03 and go
+
+These settings apply only when `--tag=package-preview-2021-03 --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-03' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-03-01-preview/$(namespace)
+```
+
 ### Tag: package-2021-03 and go
 
 These settings apply only when `--tag=package-2021-03 --go` is specified on the command line.
diff --git a/specification/resources/resource-manager/readme.go.md b/specification/resources/resource-manager/readme.go.md
index 1adeb9603754..1942c002e74b 100644
--- a/specification/resources/resource-manager/readme.go.md
+++ b/specification/resources/resource-manager/readme.go.md
@@ -222,6 +222,16 @@ namespace: policy
 output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2015-10-01-preview/policy
 ```
 
+### Tag: package-resources-2021-01 and go
+
+These settings apply only when `--tag=package-resources-2021-01 --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-resources-2021-01' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2021-01-01/resources
+```
+
 ### Tag: package-resources-2020-10 and go
 
 These settings apply only when `--tag=package-resources-2020-10 --go` is specified on the command line.