diff --git a/specification/azurestackhci/resource-manager/readme.go.md b/specification/azurestackhci/resource-manager/readme.go.md
index a7f05b7c4929..0b8a319c2c4b 100644
--- a/specification/azurestackhci/resource-manager/readme.go.md
+++ b/specification/azurestackhci/resource-manager/readme.go.md
@@ -12,10 +12,21 @@ go:
 
 ```yaml $(go) && $(multiapi)
 batch:
+  - tag: package-preview-2021-01
   - tag: package-2020-10
   - tag: package-2020-03-01-preview
 ```
 
+### Tag: package-preview-2021-01 and go
+
+These settings apply only when `--tag=package-preview-2021-01 --go` is specified on the command line.
+Please also specify `--go-sdks-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-preview-2021-01' && $(go)
+namespace: azurestackhci
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-01-01-preview/$(namespace)
+```
+
 ### Tag: package-2020-10 and go
 
 These settings apply only when `--tag=package-2020-10 --go` is specified on the command line.
diff --git a/specification/cosmos-db/resource-manager/readme.go.md b/specification/cosmos-db/resource-manager/readme.go.md
index 0605606a6fc6..c9e9967ef1a5 100644
--- a/specification/cosmos-db/resource-manager/readme.go.md
+++ b/specification/cosmos-db/resource-manager/readme.go.md
@@ -13,6 +13,7 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-06
   - tag: package-2021-05
   - tag: package-2021-04
   - tag: package-2021-04-preview
@@ -29,6 +30,15 @@ batch:
   - tag: package-2015-04
 ```
 
+### 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/cosmos-db/mgmt/2021-06-15/$(namespace)
+```
+
 ### Tag: package-2021-05 and go
 
 These settings apply only when `--tag=package-2021-05 --go` is specified on the command line.