diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
index 2174cc1e0e84..8f4a653587c2 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
@@ -721,11 +721,7 @@
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
-            "name": "taskRunName",
-            "in": "path",
-            "description": "The run request name.",
-            "required": true,
-            "type": "string"
+            "$ref": "#/parameters/TaskRunNameParameter"
           }
         ],
         "responses": {
@@ -768,11 +764,7 @@
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
-            "name": "taskRunName",
-            "in": "path",
-            "description": "The name of task run.",
-            "required": true,
-            "type": "string"
+            "$ref": "#/parameters/TaskRunNameParameter"
           },
           {
             "name": "taskRun",
@@ -831,11 +823,7 @@
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
-            "name": "taskRunName",
-            "in": "path",
-            "description": "The task run name.",
-            "required": true,
-            "type": "string"
+            "$ref": "#/parameters/TaskRunNameParameter"
           }
         ],
         "responses": {
@@ -882,11 +870,7 @@
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
-            "name": "taskRunName",
-            "in": "path",
-            "description": "The task run name.",
-            "required": true,
-            "type": "string"
+            "$ref": "#/parameters/TaskRunNameParameter"
           },
           {
             "name": "updateParameters",
@@ -947,11 +931,7 @@
             "$ref": "#/parameters/ApiVersionParameter"
           },
           {
-            "name": "taskRunName",
-            "in": "path",
-            "description": "The run request name.",
-            "required": true,
-            "type": "string"
+            "$ref": "#/parameters/TaskRunNameParameter"
           }
         ],
         "responses": {
@@ -1916,7 +1896,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -1928,6 +1908,10 @@
           "$ref": "#/definitions/TaskRunProperties",
           "description": "The properties associated with the task run, i.e., request and result of the run",
           "x-ms-client-flatten": true
+        },
+        "location": {
+          "description": "The location of the resource",
+          "type": "string"
         }
       }
     },
@@ -2028,6 +2012,10 @@
           "description": "The properties for updating a task run.",
           "x-ms-client-flatten": true
         },
+        "location": {
+          "description": "The location of the resource",
+          "type": "string"
+        },
         "tags": {
           "description": "The ARM resource tags.",
           "type": "object",
@@ -3602,6 +3590,17 @@
       "minLength": 3,
       "pattern": "^[a-zA-Z0-9-]*$",
       "x-ms-parameter-location": "method"
+    },
+    "TaskRunNameParameter": {
+      "name": "taskRunName",
+      "in": "path",
+      "description": "The name of the task run.",
+      "required": true,
+      "type": "string",
+      "maxLength": 50,
+      "minLength": 5,
+      "pattern": "^[a-zA-Z0-9-]*$",
+      "x-ms-parameter-location": "method"
     }
   },
   "securityDefinitions": {
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsCreate.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsCreate.json
index d3df479742b5..1b95e805388d 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsCreate.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsCreate.json
@@ -6,10 +6,6 @@
     "api-version": "2019-06-01-preview",
     "taskRunName": "myRun",
     "taskRun": {
-      "location": "westus",
-      "tags": {
-        "key": "value"
-      },
       "properties": {
         "forceUpdateTag": "test",
         "runRequest": {
@@ -67,11 +63,7 @@
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-        "name": "myrun",
-        "tags": {
-          "key": "value"
-        },
-        "location": "WESTUS"
+        "name": "myrun"
       }
     },
     "201": {
@@ -114,11 +106,7 @@
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-        "name": "myrun",
-        "tags": {
-          "key": "value"
-        },
-        "location": "WESTUS"
+        "name": "myrun"
       }
     }
   }
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGet.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGet.json
index 756b24ef7dcd..bf58544d51da 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGet.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGet.json
@@ -49,11 +49,7 @@
           }
         },
         "id": "/subscriptions/3647315e-0c5b-4ce4-8739-b071e144b2c9/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-        "name": "myRun",
-        "tags": {
-          "key": "value"
-        },
-        "location": "WESTUS"
+        "name": "myRun"
       }
     }
   }
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGetDetails.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGetDetails.json
index 756b24ef7dcd..bf58544d51da 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGetDetails.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsGetDetails.json
@@ -49,11 +49,7 @@
           }
         },
         "id": "/subscriptions/3647315e-0c5b-4ce4-8739-b071e144b2c9/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-        "name": "myRun",
-        "tags": {
-          "key": "value"
-        },
-        "location": "WESTUS"
+        "name": "myRun"
       }
     }
   }
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsList.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsList.json
index d573ca7e39b4..2a9eee17142a 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsList.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsList.json
@@ -50,11 +50,7 @@
               }
             },
             "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-            "name": "mytestrun",
-            "tags": {
-              "key": "value"
-            },
-            "location": "WESTUS"
+            "name": "mytestrun"
           }
         ]
       }
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsUpdate.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsUpdate.json
index a629bff26d79..2b6760729d81 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsUpdate.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TaskRunsUpdate.json
@@ -64,11 +64,7 @@
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-        "name": "mytestrun",
-        "tags": {
-          "key": "value"
-        },
-        "location": "WESTUS"
+        "name": "mytestrun"
       }
     },
     "201": {
@@ -111,11 +107,7 @@
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/taskRuns/myRun",
-        "name": "mytestrun",
-        "tags": {
-          "key": "value"
-        },
-        "location": "WESTUS"
+        "name": "mytestrun"
       }
     }
   }