diff --git a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Constant-AmlFilesystemIdentityType.cs b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Constant-AmlFilesystemIdentityType.cs
deleted file mode 100644
index 97041f6d508..00000000000
--- a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Constant-AmlFilesystemIdentityType.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Pandora.Definitions.Attributes;
-using System.ComponentModel;
-
-namespace Pandora.Definitions.ResourceManager.StorageCache.v2023_05_01.AmlFilesystems;
-
-[ConstantType(ConstantTypeAttribute.ConstantType.String)]
-internal enum AmlFilesystemIdentityTypeConstant
-{
-    [Description("None")]
-    None,
-
-    [Description("UserAssigned")]
-    UserAssigned,
-}
diff --git a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Definition.cs b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Definition.cs
index e053a5d0f9f..fd7a754ed87 100644
--- a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Definition.cs
+++ b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Definition.cs
@@ -27,7 +27,6 @@ internal class Definition : ResourceDefinition
     public IEnumerable<System.Type> Constants => new List<System.Type>
     {
         typeof(AmlFilesystemHealthStateTypeConstant),
-        typeof(AmlFilesystemIdentityTypeConstant),
         typeof(AmlFilesystemProvisioningStateTypeConstant),
         typeof(ArchiveStatusTypeConstant),
         typeof(MaintenanceDayOfWeekTypeConstant),
@@ -43,7 +42,6 @@ internal class Definition : ResourceDefinition
         typeof(AmlFilesystemEncryptionSettingsModel),
         typeof(AmlFilesystemHealthModel),
         typeof(AmlFilesystemHsmSettingsModel),
-        typeof(AmlFilesystemIdentityModel),
         typeof(AmlFilesystemPropertiesModel),
         typeof(AmlFilesystemPropertiesHsmModel),
         typeof(AmlFilesystemPropertiesMaintenanceWindowModel),
@@ -56,6 +54,5 @@ internal class Definition : ResourceDefinition
         typeof(RequiredAmlFilesystemSubnetsSizeModel),
         typeof(RequiredAmlFilesystemSubnetsSizeInfoModel),
         typeof(SkuNameModel),
-        typeof(UserAssignedIdentitiesPropertiesModel),
     };
 }
diff --git a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystem.cs b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystem.cs
index 03c1e4c9abf..807f465b257 100644
--- a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystem.cs
+++ b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystem.cs
@@ -19,7 +19,7 @@ internal class AmlFilesystemModel
     public string? Id { get; set; }
 
     [JsonPropertyName("identity")]
-    public AmlFilesystemIdentityModel? Identity { get; set; }
+    public CustomTypes.UserAssignedIdentityMap? Identity { get; set; }
 
     [JsonPropertyName("location")]
     [Required]
diff --git a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystemIdentity.cs b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystemIdentity.cs
deleted file mode 100644
index bf8fbbfe818..00000000000
--- a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-AmlFilesystemIdentity.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-using Pandora.Definitions.Attributes;
-using Pandora.Definitions.Attributes.Validation;
-using Pandora.Definitions.CustomTypes;
-
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See NOTICE.txt in the project root for license information.
-
-
-namespace Pandora.Definitions.ResourceManager.StorageCache.v2023_05_01.AmlFilesystems;
-
-
-internal class AmlFilesystemIdentityModel
-{
-    [JsonPropertyName("principalId")]
-    public string? PrincipalId { get; set; }
-
-    [JsonPropertyName("tenantId")]
-    public string? TenantId { get; set; }
-
-    [JsonPropertyName("type")]
-    public AmlFilesystemIdentityTypeConstant? Type { get; set; }
-
-    [JsonPropertyName("userAssignedIdentities")]
-    public Dictionary<string, UserAssignedIdentitiesPropertiesModel>? UserAssignedIdentities { get; set; }
-}
diff --git a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-UserAssignedIdentitiesProperties.cs b/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-UserAssignedIdentitiesProperties.cs
deleted file mode 100644
index da4b53cbe22..00000000000
--- a/data/Pandora.Definitions.ResourceManager/StorageCache/v2023_05_01/AmlFilesystems/Model-UserAssignedIdentitiesProperties.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-using Pandora.Definitions.Attributes;
-using Pandora.Definitions.Attributes.Validation;
-using Pandora.Definitions.CustomTypes;
-
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See NOTICE.txt in the project root for license information.
-
-
-namespace Pandora.Definitions.ResourceManager.StorageCache.v2023_05_01.AmlFilesystems;
-
-
-internal class UserAssignedIdentitiesPropertiesModel
-{
-    [JsonPropertyName("clientId")]
-    public string? ClientId { get; set; }
-
-    [JsonPropertyName("principalId")]
-    public string? PrincipalId { get; set; }
-}