diff --git a/specification/healthdataaiservices/HealthDataAIServices.Management/main.tsp b/specification/healthdataaiservices/HealthDataAIServices.Management/main.tsp
index be066942680a..914a52292a69 100644
--- a/specification/healthdataaiservices/HealthDataAIServices.Management/main.tsp
+++ b/specification/healthdataaiservices/HealthDataAIServices.Management/main.tsp
@@ -139,7 +139,7 @@ interface PrivateEndpointConnections {
   /** Delete the private endpoint connection */
   delete is ArmResourceDeleteWithoutOkAsync<PrivateEndpointConnectionResource>;
   /** List private endpoint connections on the given resource */
-  list is ArmResourceListByParent<PrivateEndpointConnectionResource>;
+  listByDeidService is ArmResourceListByParent<PrivateEndpointConnectionResource>;
 }
 
 /** Private Links for DeidService resource */
@@ -153,5 +153,5 @@ model PrivateLinkResource is ProxyResource<PrivateLinkResourceProperties> {
 @armResourceOperations(PrivateLinkResource)
 interface PrivateLinks {
   /** List private links on the given resource */
-  list is ArmResourceListByParent<PrivateLinkResource>;
+  listByDeidService is ArmResourceListByParent<PrivateLinkResource>;
 }
diff --git a/specification/healthdataaiservices/resource-manager/Microsoft.HealthDataAIServices/preview/2024-02-28-preview/openapi.json b/specification/healthdataaiservices/resource-manager/Microsoft.HealthDataAIServices/preview/2024-02-28-preview/openapi.json
index 27ecac54c36b..b8ed648f754a 100644
--- a/specification/healthdataaiservices/resource-manager/Microsoft.HealthDataAIServices/preview/2024-02-28-preview/openapi.json
+++ b/specification/healthdataaiservices/resource-manager/Microsoft.HealthDataAIServices/preview/2024-02-28-preview/openapi.json
@@ -719,42 +719,6 @@
     }
   },
   "definitions": {
-    "Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType": {
-      "type": "string",
-      "description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
-      "enum": [
-        "None",
-        "SystemAssigned",
-        "UserAssigned",
-        "SystemAssigned,UserAssigned"
-      ],
-      "x-ms-enum": {
-        "name": "ManagedServiceIdentityType",
-        "modelAsString": true,
-        "values": [
-          {
-            "name": "None",
-            "value": "None",
-            "description": "No managed identity."
-          },
-          {
-            "name": "SystemAssigned",
-            "value": "SystemAssigned",
-            "description": "System assigned managed identity."
-          },
-          {
-            "name": "UserAssigned",
-            "value": "UserAssigned",
-            "description": "User assigned managed identity."
-          },
-          {
-            "name": "SystemAndUserAssigned",
-            "value": "SystemAssigned,UserAssigned",
-            "description": "System and user assigned managed identity."
-          }
-        ]
-      }
-    },
     "DeidPropertiesUpdate": {
       "type": "object",
       "description": "The template for adding optional properties.",
@@ -771,8 +735,7 @@
       "properties": {
         "properties": {
           "$ref": "#/definitions/DeidServiceProperties",
-          "description": "The resource-specific properties for this resource.",
-          "x-ms-client-flatten": true
+          "description": "The resource-specific properties for this resource."
         },
         "identity": {
           "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
@@ -860,15 +823,20 @@
       "description": "The template for adding optional properties.",
       "properties": {
         "type": {
-          "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType",
+          "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentityType",
           "description": "The type of managed identity assigned to this resource."
         },
         "userAssignedIdentities": {
           "type": "object",
           "description": "The identities assigned to this resource by the user.",
-          "x-nullable": true,
           "additionalProperties": {
-            "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/UserAssignedIdentity"
+            "allOf": [
+              {
+                "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/UserAssignedIdentity"
+              }
+            ],
+            "type": "object",
+            "x-nullable": true
           }
         }
       }
@@ -879,8 +847,7 @@
       "properties": {
         "properties": {
           "$ref": "../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnectionProperties",
-          "description": "The resource-specific properties for this resource.",
-          "x-ms-client-flatten": true
+          "description": "The resource-specific properties for this resource."
         }
       },
       "allOf": [
@@ -916,8 +883,7 @@
       "properties": {
         "properties": {
           "$ref": "../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateLinkResourceProperties",
-          "description": "The resource-specific properties for this resource.",
-          "x-ms-client-flatten": true
+          "description": "The resource-specific properties for this resource."
         }
       },
       "allOf": [