diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json
index 6afb591f359f..8805bab1ea83 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json
@@ -38,6 +38,12 @@
             "schema": {
               "$ref": "#/definitions/OperationList"
             }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
           }
         },
         "x-ms-pageable": {
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CustomerSubscription.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CustomerSubscription.json
index 194fc6e4914e..b85e74a3a4c7 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CustomerSubscription.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CustomerSubscription.json
@@ -138,6 +138,12 @@
           },
           "204": {
             "description": "NO CONTENT"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "AzureStack.json#/definitions/ErrorResponse"
+            }
           }
         }
       },
@@ -178,6 +184,12 @@
             "schema": {
               "$ref": "#/definitions/CustomerSubscription"
             }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "AzureStack.json#/definitions/ErrorResponse"
+            }
           }
         }
       }
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Product.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Product.json
index 3bb41c7bff94..233fb31cbc06 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Product.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Product.json
@@ -140,11 +140,17 @@
             "schema": {
               "$ref": "#/definitions/ExtendedProduct"
             }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "AzureStack.json#/definitions/ErrorResponse"
+            }
           }
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/_all/GetProducts": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProducts": {
       "post": {
         "x-ms-examples": {
           "Returns a list of products.": {
@@ -166,6 +172,9 @@
           {
             "$ref": "AzureStack.json#/parameters/RegistrationNameParameter"
           },
+          {
+            "$ref": "#/parameters/ProductNameParameter"
+          },
           {
             "$ref": "#/parameters/DeviceConfigurationParameter"
           },
@@ -189,7 +198,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/GetProduct": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProduct": {
       "post": {
         "x-ms-examples": {
           "Returns the specified product.": {
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Registration.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Registration.json
index 1216c20372ad..c2e067d946e9 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Registration.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/Registration.json
@@ -178,6 +178,12 @@
             "schema": {
               "$ref": "#/definitions/Registration"
             }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "AzureStack.json#/definitions/ErrorResponse"
+            }
           }
         }
       },
@@ -257,6 +263,48 @@
             "schema": {
               "$ref": "#/definitions/ActivationKeyResult"
             }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "AzureStack.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/enableRemoteManagement": {
+      "post": {
+        "x-ms-examples": {
+          "Returns empty response for successful action..": {
+            "$ref": "examples/RemoteManagement/Post.json"
+          }
+        },
+        "tags": [
+          "Registrations"
+        ],
+        "description": "Enables remote management for device under the Azure Stack registration.",
+        "operationId": "Registrations_EnableRemoteManagement",
+        "parameters": [
+          {
+            "$ref": "AzureStack.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "AzureStack.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "AzureStack.json#/parameters/RegistrationNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "AzureStack.json#/definitions/ErrorResponse"
+            }
           }
         }
       }
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/GetPost.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/GetPost.json
index a26e3403bb63..fea6849c2550 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/GetPost.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/GetPost.json
@@ -4,11 +4,7 @@
     "resourceGroup": "azurestack",
     "registrationName": "testregistration",
     "productName": "Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1",
-    "api-version": "2017-06-01",
-    "deviceConfiguration": {
-      "identitySystem": "AzureAD",
-      "deviceVersion": "1910.0.0.0"
-    }
+    "api-version": "2017-06-01"
   },
   "responses": {
     "200": {
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/ListPost.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/ListPost.json
index 8840a2d255e6..6b954cd83e38 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/ListPost.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/ListPost.json
@@ -3,11 +3,8 @@
     "subscriptionId": "dd8597b4-8739-4467-8b10-f8679f62bfbf",
     "resourceGroup": "azurestack",
     "registrationName": "testregistration",
-    "api-version": "2017-06-01",
-    "deviceConfiguration": {
-      "identitySystem": "AzureAD",
-      "deviceVersion": "1910.0.0.0"
-    }
+    "productName": "_all",
+    "api-version": "2017-06-01"
   },
   "responses": {
     "200": {
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/UploadLog.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/UploadLog.json
index 8d29e414c3fa..439e3271ba4d 100644
--- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/UploadLog.json
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Product/UploadLog.json
@@ -4,13 +4,7 @@
     "resourceGroup": "azurestack",
     "registrationName": "testregistration",
     "productName": "Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1",
-    "api-version": "2017-06-01",
-    "marketplaceProductLogUpdate": {
-      "operation": "Download",
-      "status": "Failed",
-      "error": "ExampleError",
-      "details": "ExampleDetails"
-    }
+    "api-version": "2017-06-01"
   },
   "responses": {
     "200": {
diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/RemoteManagement/Post.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/RemoteManagement/Post.json
new file mode 100644
index 000000000000..3a49f5053e29
--- /dev/null
+++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/RemoteManagement/Post.json
@@ -0,0 +1,11 @@
+{
+  "parameters": {
+    "subscriptionId": "dd8597b4-8739-4467-8b10-f8679f62bfbf",
+    "resourceGroup": "azurestack",
+    "registrationName": "testregistration",
+    "api-version": "2017-06-01"
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/specification/azurestack/resource-manager/readme.azureresourceschema.md b/specification/azurestack/resource-manager/readme.azureresourceschema.md
index 1216d57dd7c8..5089b5b81512 100644
--- a/specification/azurestack/resource-manager/readme.azureresourceschema.md
+++ b/specification/azurestack/resource-manager/readme.azureresourceschema.md
@@ -23,5 +23,5 @@ input-file:
   - Microsoft.AzureStack/stable/2017-06-01/Product.json
   - Microsoft.AzureStack/stable/2017-06-01/Registration.json
   - Microsoft.AzureStack/stable/2017-06-01/CustomerSubscription.json
-
+  
 ```