diff --git a/specification/batchai/resource-manager/readme.md b/specification/batchai/resource-manager/readme.md
index c9e36eaf5b11..8b9186b5d421 100644
--- a/specification/batchai/resource-manager/readme.md
+++ b/specification/batchai/resource-manager/readme.md
@@ -132,6 +132,7 @@ go:
 batch:
   - tag: package-2017-09-preview
   - tag: package-2018-03
+  - tag: package-2018-05
 ```
 
 ### Tag: package-2017-09-preview and go
@@ -154,7 +155,7 @@ output-folder: $(go-sdk-folder)/services/batchai/mgmt/2018-03-01/batchai
 
 ### Tag: package-2018-05 and go
 
-These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
+These settings apply only when `--tag=package-2018-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-2018-05' && $(go)
diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md
index 086605535a92..511f2e2da919 100644
--- a/specification/botservice/resource-manager/readme.md
+++ b/specification/botservice/resource-manager/readme.md
@@ -93,6 +93,13 @@ go:
   clear-output-folder: true
 ```
 
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-12-01
+```
+
 ### Tag: package-2017-12-01 and go
 
 These settings apply only when `--tag=package-2017-12-01 --go` is specified on the command line.
diff --git a/specification/cognitiveservices/data-plane/VisualSearch/readme.md b/specification/cognitiveservices/data-plane/VisualSearch/readme.md
index d8684c23e008..536be8d34cb3 100644
--- a/specification/cognitiveservices/data-plane/VisualSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/VisualSearch/readme.md
@@ -74,3 +74,30 @@ python:
   basic-setup-py: true
   output-folder: $(python-sdks-folder)/azure-cognitiveservices-search-visualsearch
 ```
+
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: visualsearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --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) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/cognitiveservices/v1.0/$(namespace)
+```
diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md
index 5a5231f92500..3ef7b8e612dc 100644
--- a/specification/containerinstance/resource-manager/readme.md
+++ b/specification/containerinstance/resource-manager/readme.md
@@ -155,12 +155,22 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2018-04
   - tag: package-2018-02-preview
   - tag: package-2017-12-preview
   - tag: package-2017-10-preview
   - tag: package-2017-08-preview
 ```
 
+### Tag: package-2018-04 and go
+
+These settings apply only when `--tag=package-2018-04 --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-2018-04' && $(go)
+output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-04-01/containerinstance
+```
+
 ### Tag: package-2018-02-preview and go
 
 These settings apply only when `--tag=package-2018-02-preview --go` is specified on the command line.
diff --git a/specification/containerregistry/resource-manager/readme.md b/specification/containerregistry/resource-manager/readme.md
index c27116082812..e46498f24e46 100644
--- a/specification/containerregistry/resource-manager/readme.md
+++ b/specification/containerregistry/resource-manager/readme.md
@@ -186,12 +186,22 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2018-02-preview
   - tag: package-2017-10
   - tag: package-2017-06-preview
   - tag: package-2017-03
   - tag: package-2016-06-preview
 ```
 
+### Tag: package-2018-02-preview and go
+
+These settings apply only when `--tag=package-2018-02-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-2018-02-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/containerregistry/mgmt/2018-02-01/containerregistry
+```
+
 ### Tag: package-2017-10 and go
 
 These settings apply only when `--tag=package-2017-10 --go` is specified on the command line.
diff --git a/specification/deviceprovisioningservices/resource-manager/readme.md b/specification/deviceprovisioningservices/resource-manager/readme.md
index f0f220234fd6..31b0dbdf2f9a 100644
--- a/specification/deviceprovisioningservices/resource-manager/readme.md
+++ b/specification/deviceprovisioningservices/resource-manager/readme.md
@@ -138,7 +138,7 @@ batch:
 These settings apply only when `--tag=package-2018-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-2017-11' && $(go)
+``` yaml $(tag)=='package-2018-01' && $(go)
 output-folder: $(go-sdk-folder)/services/provisioningservices/mgmt/2018-01-22/iothub
 ```
 
@@ -153,7 +153,7 @@ output-folder: $(go-sdk-folder)/services/provisioningservices/mgmt/2017-11-15/io
 
 ### Tag: package-2017-08 and go
 
-These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
+These settings apply only when `--tag=package-2017-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-2017-08' && $(go)
diff --git a/specification/keyvault/data-plane/readme.md b/specification/keyvault/data-plane/readme.md
index ac6eee85e767..b4ba53081828 100644
--- a/specification/keyvault/data-plane/readme.md
+++ b/specification/keyvault/data-plane/readme.md
@@ -131,10 +131,20 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-7.0-preview
   - tag: package-2016-10
   - tag: package-2015-06
 ```
 
+### Tag: package-7.0-preview and go
+
+These settings apply only when `--tag=package-7.0-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-7.0-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/keyvault/v7.0/keyvault
+```
+
 ### Tag: package-2016-10 and go
 
 These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
diff --git a/specification/machinelearning/resource-manager/readme.md b/specification/machinelearning/resource-manager/readme.md
index 6c516b8775a4..87de6b17e5e8 100644
--- a/specification/machinelearning/resource-manager/readme.md
+++ b/specification/machinelearning/resource-manager/readme.md
@@ -133,6 +133,7 @@ go:
 batch:
   - tag: package-webservices-2017-01
   - tag: package-webservices-2016-05-preview
+  - tag: package-workspaces-2016-04
   - tag: package-commitmentPlans-2016-05-preview
 ```
 
@@ -156,6 +157,16 @@ namespace: webservices
 output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2016-05-01-preview/webservices
 ```
 
+### Tag: package-workspaces-2016-04 and go
+
+These settings apply only when `--tag=package-workspaces-2016-04 --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-workspaces-2016-04' && $(go)
+namespace: workspaces
+output-folder: $(go-sdk-folder)/services/machinelearning/mgmt/2016-04-01/workspaces
+```
+
 ### Tag: package-commitmentPlans-2016-05-preview and go
 
 These settings apply only when `--tag=package-commitmentPlans-2016-05-preview --go` is specified on the command line.
diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md
index ccc1d905be52..1106389f1059 100644
--- a/specification/monitor/resource-manager/readme.md
+++ b/specification/monitor/resource-manager/readme.md
@@ -199,6 +199,7 @@ go:
 batch:
   - tag: package-2017-08
   - tag: package-2017-09
+  - tag: package-2018-03
 ```
 
 ### Tag: package-2017-09 and go
@@ -219,6 +220,14 @@ Please also specify `--go-sdk-folder=<path to the root directory of your azure-s
 output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2017-05-01-preview/insights
 ```
 
+### Tag: package-2018-03 and go
+
+These settings apply only when `--tag=package-2018-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-2018-03' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-03-01/insights
+```
 
 ## Python
 
diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md
index 80eee45f3b9f..341b9c35a2e8 100644
--- a/specification/network/resource-manager/readme.md
+++ b/specification/network/resource-manager/readme.md
@@ -428,6 +428,7 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2018-04
   - tag: package-2018-02
   - tag: package-2018-01
   - tag: package-2017-11
@@ -444,6 +445,15 @@ batch:
   - tag: package-2015-05-preview
 ```
 
+### Tag: package-2018-04 and go
+
+These settings apply only when `--tag=package-2018-04 --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-2018-04' && $(go)
+output-folder: $(go-sdk-folder)/services/network/mgmt/2018-04-01/network
+```
+
 ### Tag: package-2018-02 and go
 
 These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md
index f05104957d7b..780677d59fc0 100644
--- a/specification/resources/resource-manager/readme.md
+++ b/specification/resources/resource-manager/readme.md
@@ -327,6 +327,7 @@ batch:
   - tag: package-subscriptions-2015-11
   - tag: package-links-2016-09
   - tag: package-managedapplications-2016-09
+  - tag: package-managedapplications-2017-09
 ```
 
 ### Tag: package-features-2015-12 and go
@@ -499,6 +500,16 @@ namespace: managedapplications
 output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2016-09-01-preview/managedapplications
 ```
 
+### Tag: package-managedapplications-2017-09 and go
+
+These settings apply only when `--tag=package-managedapplications-2017-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-managedapplications-2017-09' && $(go)
+namespace: managedapplications
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2017-09-01/managedapplications
+```
+
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md
index 01234c5e2eae..6a0813d06a14 100644
--- a/specification/subscription/resource-manager/readme.md
+++ b/specification/subscription/resource-manager/readme.md
@@ -129,6 +129,7 @@ go:
 ``` yaml $(go) && $(multiapi)
 batch:
   - tag: package-2018-03-preview
+  - tag: package-2017-11-preview
 ```
 
 ### Tag: package-2018-03-preview and go
diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md
index 96cbc90e636b..4e707cb639be 100644
--- a/specification/web/resource-manager/readme.md
+++ b/specification/web/resource-manager/readme.md
@@ -289,10 +289,20 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2018-02
   - tag: package-2016-09
   - tag: package-2015-08-preview
 ```
 
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-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-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/web/mgmt/2018-02-01/web
+```
+
 ### Tag: package-2016-09 and go
 
 These settings apply only when `--tag=package-2016-09 --go` is specified on the command line.