diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-07-01/containerService.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-07-01/containerService.json
index 330684d163f8..d2e5b36e5f9e 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-07-01/containerService.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-07-01/containerService.json
@@ -678,16 +678,7 @@
           "description": "VNet SubnetID specifies the vnet's subnet identifier."
         },
         "osType": {
-          "type": "string",
-          "default": "Linux",
-          "enum": [
-            "Linux",
-            "Windows"
-          ],
-          "x-ms-enum": {
-            "name": "OSType",
-            "modelAsString": true
-          },
+          "$ref": "#/definitions/OSType",
           "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
         }
       },
@@ -873,6 +864,19 @@
         "linuxProfile"
       ],
       "description": "Properties of the container service."
+    },
+    "OSType": {
+      "type": "string",
+      "default": "Linux",
+      "enum": [
+        "Linux",
+        "Windows"
+      ],
+      "x-ms-enum": {
+        "name": "OSType",
+        "modelAsString": true
+      },
+      "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
     }
   },
   "parameters": {
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersCreate_Update.json
index fe9ba362dd7c..776ea8057293 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersCreate_Update.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersCreate_Update.json
@@ -55,12 +55,13 @@
           },
           "provisioningState": "Succeeded",
           "servicePrincipalProfile": {
-            "clientId": "clientid",
-            "keyVaultSecretRef": null,
-            "secret": "secret"
+            "clientId": "clientid"
           }
         },
-        "tags": "managedcluster",
+        "tags": {
+          "archv2": "",
+          "tier": "production"
+        },
         "type": "Microsoft.ContainerService/ManagedClusters"
       }
     },
@@ -99,12 +100,13 @@
           },
           "provisioningState": "Succeeded",
           "servicePrincipalProfile": {
-            "clientId": "clientid",
-            "keyVaultSecretRef": null,
-            "secret": "secret"
+            "clientId": "clientid"
           }
         },
-        "tags": "managedcluster",
+        "tags": {
+          "archv2": "",
+          "tier": "production"
+        },
         "type": "Microsoft.ContainerService/ManagedClusters"
       }
     }
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersGet.json
index ace118713d2c..7eb0ed30a77c 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersGet.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersGet.json
@@ -41,12 +41,13 @@
           },
           "provisioningState": "Succeeded",
           "servicePrincipalProfile": {
-            "clientId": "clientid",
-            "keyVaultSecretRef": null,
-            "secret": "secret"
+            "clientId": "clientid"
           }
         },
-        "tags": "managed-cluster",
+        "tags": {
+          "archv2": "",
+          "tier": "production"
+        },
         "type": "Microsoft.ContainerService/ManagedClusters"
       }
     }
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersList.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersList.json
index f3cc91bf7b20..01b4f967211f 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersList.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersList.json
@@ -41,12 +41,13 @@
               },
               "provisioningState": "Succeeded",
               "servicePrincipalProfile": {
-                "clientId": "clientid",
-                "keyVaultSecretRef": null,
-                "secret": "secret"
+                "clientId": "clientid"
               }
             },
-            "tags": "managed-cluster",
+            "tags": {
+              "archv2": "",
+              "tier": "production"
+            },
             "type": "Microsoft.ContainerService/ManagedClusters"
           }
         ]
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersListByResourceGroup.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersListByResourceGroup.json
index 10a805e885d7..19c10ddee39d 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersListByResourceGroup.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/examples/ManagedClustersListByResourceGroup.json
@@ -42,12 +42,13 @@
               },
               "provisioningState": "Succeeded",
               "servicePrincipalProfile": {
-                "clientId": "clientid",
-                "keyVaultSecretRef": null,
-                "secret": "secret"
+                "clientId": "clientid"
               }
             },
-            "tags": "managed-cluster",
+            "tags": {
+              "archv2": "",
+              "tier": "production"
+            },
             "type": "Microsoft.ContainerService/ManagedClusters"
           }
         ]
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/managedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/managedClusters.json
index 2cba2a5ab6d6..e171ee495c85 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/managedClusters.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2017-08-31/managedClusters.json
@@ -469,7 +469,7 @@
     },
     "ContainerServiceVnetSubnetID": {
       "type": "string",
-      "description": "VNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet."
+      "description": "VNet SubnetID specifies the vnet's subnet identifier."
     },
     "ContainerServiceVMSize": {
       "type": "string",
@@ -727,7 +727,7 @@
         },
         "vnetSubnetID": {
           "$ref": "#/definitions/ContainerServiceVnetSubnetID",
-          "description": "VNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet."
+          "description": "VNet SubnetID specifies the vnet's subnet identifier."
         },
         "firstConsecutiveStaticIP": {
           "type": "string",
@@ -796,7 +796,7 @@
         },
         "vnetSubnetID": {
           "$ref": "#/definitions/ContainerServiceVnetSubnetID",
-          "description": "VNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet."
+          "description": "VNet SubnetID specifies the vnet's subnet identifier."
         },
         "osType": {
           "$ref": "#/definitions/OSType",
diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md
index 6243df4b784a..18c325527bfb 100644
--- a/specification/containerservices/resource-manager/readme.md
+++ b/specification/containerservices/resource-manager/readme.md
@@ -159,11 +159,22 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2018-03
   - tag: package-2017-09
   - tag: package-2017-08
   - tag: package-2017-07
 ```
 
+### 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)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2018-03-31/containerservice
+```
+
 ### Tag: package-2017-09 and go
 
 These settings apply only when `--tag=package-2017-09 --go` is specified on the command line.