diff --git a/specification/msi/resource-manager/Microsoft.ManagedIdentity/preview/2015-08-31-preview/ManagedIdentity.json b/specification/msi/resource-manager/Microsoft.ManagedIdentity/preview/2015-08-31-preview/ManagedIdentity.json
index 722c03ad7349..0c5cbed37da1 100644
--- a/specification/msi/resource-manager/Microsoft.ManagedIdentity/preview/2015-08-31-preview/ManagedIdentity.json
+++ b/specification/msi/resource-manager/Microsoft.ManagedIdentity/preview/2015-08-31-preview/ManagedIdentity.json
@@ -351,77 +351,49 @@
     }
   },
   "definitions": {
-    "Resource": {
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The id of the resource."
-        },
-        "name": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The name of the resource."
-        },
-        "location": {
-          "type": "string",
-          "description": "The Azure region where the resource lives."
-        }
-      },
-      "x-ms-azure-resource": true,
-      "description": "Describes common properties of a resource."
-    },
     "Identity": {
       "properties": {
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags"
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "readOnly": true,
           "description": "The properties associated with the identity.",
           "$ref": "#/definitions/IdentityProperties"
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "enum": [
-            "Microsoft.ManagedIdentity/userAssignedIdentities"
-          ],
-          "x-ms-enum": {
-            "name": "UserAssignedIdentities",
-            "modelAsString": true
-          },
-          "description": "The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities"
         }
       },
-      "required": [
-        "location"
-      ],
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
         }
       ],
-      "x-ms-azure-resource": true,
       "description": "Describes an identity resource."
     },
     "SystemAssignedIdentity": {
       "properties": {
+        "location": {
+          "type": "string",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ],
+          "description": "The geo-location where the resource lives"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "x-ms-mutability": [
+            "read",
+            "create",
+            "update"
+          ],
+          "description": "Resource tags"
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "readOnly": true,
           "description": "The properties associated with the identity.",
           "$ref": "#/definitions/IdentityProperties"
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The type of resource i.e. Microsoft.Compute/virtualMachineScaleSets"
         }
       },
       "required": [
@@ -429,10 +401,9 @@
       ],
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
         }
       ],
-      "x-ms-azure-resource": true,
       "description": "Describes a system assigned identity resource."
     },
     "IdentityProperties": {
diff --git a/specification/msi/resource-manager/Microsoft.ManagedIdentity/stable/2018-11-30/ManagedIdentity.json b/specification/msi/resource-manager/Microsoft.ManagedIdentity/stable/2018-11-30/ManagedIdentity.json
index 1b7501907af1..16695c387b30 100644
--- a/specification/msi/resource-manager/Microsoft.ManagedIdentity/stable/2018-11-30/ManagedIdentity.json
+++ b/specification/msi/resource-manager/Microsoft.ManagedIdentity/stable/2018-11-30/ManagedIdentity.json
@@ -254,7 +254,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/IdentityPatch"
+              "$ref": "#/definitions/IdentityUpdate"
             },
             "description": "Parameters to update the identity"
           }
@@ -351,72 +351,42 @@
     }
   },
   "definitions": {
-    "Resource": {
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The id of the resource."
-        },
-        "name": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The name of the resource."
-        },
-        "location": {
-          "type": "string",
-          "description": "The Azure region where the resource lives."
-        }
-      },
-      "x-ms-azure-resource": true,
-      "description": "Describes common properties of a resource."
-    },
     "Identity": {
       "properties": {
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags"
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "readOnly": true,
           "description": "The properties associated with the identity.",
           "$ref": "#/definitions/UserAssignedIdentityProperties"
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "enum": [
-            "Microsoft.ManagedIdentity/userAssignedIdentities"
-          ],
-          "x-ms-enum": {
-            "name": "UserAssignedIdentities",
-            "modelAsString": true
-          },
-          "description": "The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities"
         }
       },
-      "required": [
-        "location"
-      ],
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
         }
       ],
-      "x-ms-azure-resource": true,
       "description": "Describes an identity resource."
     },
-    "IdentityPatch": {
+    "IdentityUpdate": {
       "properties": {
+        "location": {
+          "type": "string",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ],
+          "description": "The geo-location where the resource lives"
+        },
         "tags": {
           "type": "object",
           "additionalProperties": {
             "type": "string"
           },
+          "x-ms-mutability": [
+            "read",
+            "create",
+            "update"
+          ],
           "description": "Resource tags"
         },
         "properties": {
@@ -424,40 +394,42 @@
           "readOnly": true,
           "description": "The properties associated with the identity.",
           "$ref": "#/definitions/UserAssignedIdentityProperties"
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "enum": [
-            "Microsoft.ManagedIdentity/userAssignedIdentities"
-          ],
-          "x-ms-enum": {
-            "name": "UserAssignedIdentities",
-            "modelAsString": true
-          },
-          "description": "The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities"
         }
       },
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource"
         }
       ],
-      "x-ms-azure-resource": true,
       "description": "Describes an identity resource."
     },
     "SystemAssignedIdentity": {
       "properties": {
+        "location": {
+          "type": "string",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ],
+          "description": "The geo-location where the resource lives"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "x-ms-mutability": [
+            "read",
+            "create",
+            "update"
+          ],
+          "description": "Resource tags"
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "readOnly": true,
           "description": "The properties associated with the identity.",
           "$ref": "#/definitions/SystemAssignedIdentityProperties"
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The type of resource i.e. Microsoft.Compute/virtualMachineScaleSets"
         }
       },
       "required": [
@@ -465,10 +437,9 @@
       ],
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
         }
       ],
-      "x-ms-azure-resource": true,
       "description": "Describes a system assigned identity resource."
     },
     "SystemAssignedIdentityProperties": {