diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CancelImageBuild.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CancelImageBuild.json
index 088a634ea1e1..045174f3c081 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CancelImageBuild.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CancelImageBuild.json
@@ -6,6 +6,7 @@
     "api-version": "2020-02-14"
   },
   "responses": {
+    "200": {},
     "204": {},
     "202": {
       "headers": {
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateLinux.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateLinux.json
index fa6908fb1ca2..4d620a29b194 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateLinux.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateLinux.json
@@ -10,6 +10,12 @@
         "imagetemplate_tag1": "IT_T1",
         "imagetemplate_tag2": "IT_T2"
       },
+      "identity": {
+        "type": "UserAssigned",
+        "userAssignedIdentities": {
+          "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {}
+        }
+      },
       "properties": {
         "source": {
           "type": "ManagedImage",
@@ -50,6 +56,15 @@
         "name": "myImageTemplate",
         "location": "westus",
         "type": "Microsoft.VirtualMachineImages/imageTemplate",
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
         "properties": {
           "source": {
             "type": "ManagedImage",
@@ -89,6 +104,15 @@
         "name": "myImageTemplate",
         "location": "westus",
         "type": "Microsoft.VirtualMachineImages/imageTemplate",
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
         "properties": {
           "source": {
             "type": "ManagedImage",
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWindows.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWindows.json
index 0d062e7bba28..d3ca6b409151 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWindows.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWindows.json
@@ -10,6 +10,12 @@
         "imagetemplate_tag1": "IT_T1",
         "imagetemplate_tag2": "IT_T2"
       },
+      "identity": {
+        "type": "UserAssigned",
+        "userAssignedIdentities": {
+          "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {}
+        }
+      },
       "properties": {
         "source": {
           "type": "ManagedImage",
@@ -79,6 +85,15 @@
         "name": "myImageTemplate",
         "location": "westus",
         "type": "Microsoft.VirtualMachineImages/imageTemplate",
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
         "properties": {
           "source": {
             "type": "ManagedImage",
@@ -118,6 +133,15 @@
         "name": "myImageTemplate",
         "location": "westus",
         "type": "Microsoft.VirtualMachineImages/imageTemplate",
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
         "properties": {
           "source": {
             "type": "ManagedImage",
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWithUserAssignedIdentity.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWithUserAssignedIdentity.json
deleted file mode 100644
index 1b9970d8d04a..000000000000
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/CreateImageTemplateWithUserAssignedIdentity.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "{subscription-id}",
-    "resourceGroupName": "myResourceGroup",
-    "api-version": "2020-02-14",
-    "imageTemplateName": "myImageTemplate",
-    "parameters": {
-      "location": "westus",
-      "tags": {
-        "imagetemplate_tag1": "IT_T1",
-        "imagetemplate_tag2": "IT_T2"
-      },
-      "identity": {
-        "type": "UserAssigned",
-        "userAssignedIdentities": {
-          "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {}
-        }
-      },
-      "properties": {
-        "source": {
-          "type": "ManagedImage",
-          "imageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Compute/images/source_image"
-        },
-        "customize": [
-          {
-            "type": "Shell",
-            "name": "Shell Customizer Example",
-            "scriptUri": "https://example.com/path/to/script.sh"
-          }
-        ],
-        "distribute": [
-          {
-            "type": "ManagedImage",
-            "location": "1_location",
-            "runOutputName": "image_it_pir_1",
-            "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1",
-            "artifactTags": {
-              "tagName": "value"
-            }
-          }
-        ],
-        "vmProfile": {
-          "vmSize": "Standard_D2s_v3",
-          "osDiskSizeGB": 64
-        }
-      }
-    }
-  },
-  "responses": {
-    "201": {
-      "body": {
-        "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate",
-        "name": "myImageTemplate",
-        "location": "westus",
-        "type": "Microsoft.VirtualMachineImages/imageTemplate",
-        "identity": {
-          "type": "UserAssigned",
-          "userAssignedIdentities": {
-            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
-              "clientId": "00000000-0000-0000-0000-000000000000",
-              "principalId": "00000000-0000-0000-0000-000000000000"
-            }
-          }
-        },
-        "properties": {
-          "source": {
-            "type": "ManagedImage",
-            "imageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Compute/images/source_image"
-          },
-          "customize": [
-            {
-              "type": "Shell",
-              "name": "Shell Customizer Example",
-              "scriptUri": "https://example.com/path/to/script.sh"
-            }
-          ],
-          "distribute": [
-            {
-              "type": "ManagedImage",
-              "location": "1_location",
-              "runOutputName": "image_it_pir_1",
-              "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1",
-              "artifactTags": {
-                "tagName": "value"
-              }
-            }
-          ],
-          "vmProfile": {
-            "vmSize": "Standard_D2s_v3",
-            "osDiskSizeGB": 64
-          }
-        }
-      }
-    },
-    "200": {
-      "body": {
-        "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate",
-        "name": "myImageTemplate",
-        "location": "westus",
-        "type": "Microsoft.VirtualMachineImages/imageTemplate",
-        "identity": {
-          "type": "UserAssigned",
-          "userAssignedIdentities": {
-            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
-              "clientId": "00000000-0000-0000-0000-000000000000",
-              "principalId": "00000000-0000-0000-0000-000000000000"
-            }
-          }
-        },
-        "properties": {
-          "source": {
-            "type": "ManagedImage",
-            "imageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Compute/images/source_image"
-          },
-          "customize": [
-            {
-              "type": "Shell",
-              "name": "Shell Customizer Example",
-              "scriptUri": "https://example.com/path/to/script.sh"
-            }
-          ],
-          "distribute": [
-            {
-              "type": "ManagedImage",
-              "location": "1_location",
-              "runOutputName": "image_it_pir_1",
-              "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1",
-              "artifactTags": {
-                "tagName": "value"
-              }
-            }
-          ],
-          "vmProfile": {
-            "vmSize": "Standard_D2s_v3",
-            "osDiskSizeGB": 64
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/GetImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/GetImageTemplate.json
index 7880d2da1d8d..c10a56d9f55e 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/GetImageTemplate.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/GetImageTemplate.json
@@ -12,6 +12,15 @@
         "name": "myImageTemplate",
         "location": "westus",
         "type": "Microsoft.VirtualMachineImages/imageTemplate",
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
         "properties": {
           "source": {
             "type": "ManagedImage",
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplates.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplates.json
index 93f1ff55494a..ae408f0332f8 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplates.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplates.json
@@ -12,6 +12,15 @@
             "name": "myImageTemplate",
             "location": "westus",
             "type": "Microsoft.VirtualMachineImages/imageTemplate",
+            "identity": {
+              "type": "UserAssigned",
+              "userAssignedIdentities": {
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
             "properties": {
               "source": {
                 "type": "ManagedImage",
@@ -46,6 +55,15 @@
             "name": "mySecondImageTemplate",
             "location": "westus",
             "type": "Microsoft.VirtualMachineImages/imageTemplate",
+            "identity": {
+              "type": "UserAssigned",
+              "userAssignedIdentities": {
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
             "properties": {
               "source": {
                 "type": "PlatformImage",
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplatesByRg.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplatesByRg.json
index 0fae34193c72..679e132cf3c8 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplatesByRg.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/ListImageTemplatesByRg.json
@@ -13,6 +13,15 @@
             "name": "myImageTemplate",
             "location": "westus",
             "type": "Microsoft.VirtualMachineImages/imageTemplate",
+            "identity": {
+              "type": "UserAssigned",
+              "userAssignedIdentities": {
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
             "properties": {
               "source": {
                 "type": "ManagedImage",
@@ -47,6 +56,15 @@
             "name": "myOtherImageTemplate",
             "location": "eastus",
             "type": "Microsoft.VirtualMachineImages/imageTemplate",
+            "identity": {
+              "type": "UserAssigned",
+              "userAssignedIdentities": {
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
             "properties": {
               "source": {
                 "type": "PlatformImage",
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/RunImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/RunImageTemplate.json
index bf61cbeecee5..538fe699cf99 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/RunImageTemplate.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/RunImageTemplate.json
@@ -11,6 +11,7 @@
         "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/{location}/operations/{operation-id}?api-version=2020-02-14"
       }
     },
-    "204": {}
+    "204": {},
+    "200": {}
   }
 }
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/UpdateImageTemplateTags.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/UpdateImageTemplateTags.json
index 0d99573bea25..e799050e338c 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/UpdateImageTemplateTags.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/examples/UpdateImageTemplateTags.json
@@ -20,6 +20,15 @@
         "tags": {
           "new-tag": "new-value"
         },
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
         "properties": {
           "source": {
             "type": "ManagedImage",
diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json
index 16c3411621c9..bcd147e1d277 100644
--- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json
+++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json
@@ -175,9 +175,6 @@
           },
           "Create an Image Template for Windows.": {
             "$ref": "./examples/CreateImageTemplateWindows.json"
-          },
-          "Create an Image Template with a user assigned identity configured": {
-            "$ref": "./examples/CreateImageTemplateWithUserAssignedIdentity.json"
           }
         }
       },
@@ -350,6 +347,9 @@
           }
         ],
         "responses": {
+          "200": {
+            "description": "The operation was successful."
+          },
           "204": {
             "description": "The operation was successful."
           },
@@ -396,6 +396,9 @@
           }
         ],
         "responses": {
+          "200": {
+            "description": "The operation was successful."
+          },
           "204": {
             "description": "The long running image build has been canceled."
           },
@@ -1162,6 +1165,9 @@
         {
           "$ref": "#/definitions/Resource"
         }
+      ],
+      "required": [
+        "identity"
       ]
     },
     "ImageTemplateUpdateParameters": {