diff --git a/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs b/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs
index 60dd80fcb8d9..6f7a8c68d8fc 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs
@@ -413,7 +413,9 @@ internal CommunityGalleryImageData() { }
         public System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.GalleryImageFeature> Features { get { throw null; } }
         public Azure.ResourceManager.Compute.Models.HyperVGeneration? HyperVGeneration { get { throw null; } }
         public Azure.Core.ResourceIdentifier Id { get { throw null; } }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public Azure.ResourceManager.Compute.Models.GalleryImageIdentifier Identifier { get { throw null; } }
+        public Azure.ResourceManager.Compute.Models.CommunityGalleryImageIdentifier ImageIdentifier { get { throw null; } }
         public Azure.ResourceManager.Compute.Models.OperatingSystemStateType? OSState { get { throw null; } }
         public Azure.ResourceManager.Compute.Models.SupportedOperatingSystemType? OSType { get { throw null; } }
         public System.Uri PrivacyStatementUri { get { throw null; } }
@@ -2651,6 +2653,13 @@ public CloudServiceVaultSecretGroup() { }
         public Azure.Core.ResourceIdentifier SourceVaultId { get { throw null; } set { } }
         public System.Collections.Generic.IList<Azure.ResourceManager.Compute.Models.CloudServiceVaultCertificate> VaultCertificates { get { throw null; } }
     }
+    public partial class CommunityGalleryImageIdentifier
+    {
+        internal CommunityGalleryImageIdentifier() { }
+        public string Offer { get { throw null; } }
+        public string Publisher { get { throw null; } }
+        public string Sku { get { throw null; } }
+    }
     public partial class CommunityGalleryInfo
     {
         public CommunityGalleryInfo() { }
@@ -3467,6 +3476,26 @@ public DiskSku() { }
         public static bool operator !=(Azure.ResourceManager.Compute.Models.DiskStorageAccountType left, Azure.ResourceManager.Compute.Models.DiskStorageAccountType right) { throw null; }
         public override string ToString() { throw null; }
     }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct EdgeZoneStorageAccountType : System.IEquatable<Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType>
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public EdgeZoneStorageAccountType(string value) { throw null; }
+        public static Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType PremiumLrs { get { throw null; } }
+        public static Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType StandardLrs { get { throw null; } }
+        public static Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType StandardSsdLrs { get { throw null; } }
+        public static Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType StandardZrs { get { throw null; } }
+        public bool Equals(Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType other) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool Equals(object obj) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override int GetHashCode() { throw null; }
+        public static bool operator ==(Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType left, Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType right) { throw null; }
+        public static implicit operator Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType (string value) { throw null; }
+        public static bool operator !=(Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType left, Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType right) { throw null; }
+        public override string ToString() { throw null; }
+    }
     public partial class EncryptionImages
     {
         public EncryptionImages() { }
@@ -3840,7 +3869,9 @@ public GalleryTargetExtendedLocation() { }
         public Azure.ResourceManager.Compute.Models.EncryptionImages Encryption { get { throw null; } set { } }
         public Azure.ResourceManager.Compute.Models.GalleryExtendedLocation ExtendedLocation { get { throw null; } set { } }
         public int? ExtendedLocationReplicaCount { get { throw null; } set { } }
+        public Azure.ResourceManager.Compute.Models.EdgeZoneStorageAccountType? GalleryStorageAccountType { get { throw null; } set { } }
         public string Name { get { throw null; } set { } }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public Azure.ResourceManager.Compute.Models.ImageStorageAccountType? StorageAccountType { get { throw null; } set { } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -3998,6 +4029,7 @@ public ImageReference() { }
         public ImageStorageAccountType(string value) { throw null; }
         public static Azure.ResourceManager.Compute.Models.ImageStorageAccountType PremiumLrs { get { throw null; } }
         public static Azure.ResourceManager.Compute.Models.ImageStorageAccountType StandardLrs { get { throw null; } }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public static Azure.ResourceManager.Compute.Models.ImageStorageAccountType StandardSsdLrs { get { throw null; } }
         public static Azure.ResourceManager.Compute.Models.ImageStorageAccountType StandardZrs { get { throw null; } }
         public bool Equals(Azure.ResourceManager.Compute.Models.ImageStorageAccountType other) { throw null; }
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Customize/CommunityGalleryImageData.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/CommunityGalleryImageData.cs
new file mode 100644
index 000000000000..f3378c4a5d32
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/CommunityGalleryImageData.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System.ComponentModel;
+using Azure.ResourceManager.Compute.Models;
+
+namespace Azure.ResourceManager.Compute
+{
+    public partial class CommunityGalleryImageData
+    {
+        /// <summary> This is the gallery image definition identifier. </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public GalleryImageIdentifier Identifier => new GalleryImageIdentifier()
+        {
+            Publisher = ImageIdentifier.Publisher,
+            Offer = ImageIdentifier.Offer,
+            Sku = ImageIdentifier.Sku
+        };
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/GalleryImageIdentifier.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/GalleryImageIdentifier.cs
new file mode 100644
index 000000000000..7160423e13a1
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/GalleryImageIdentifier.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System;
+using Azure.Core;
+
+namespace Azure.ResourceManager.Compute.Models
+{
+    public partial class GalleryImageIdentifier
+    {
+        internal GalleryImageIdentifier()
+        {
+        }
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/GalleryTargetExtendedLocation.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/GalleryTargetExtendedLocation.cs
new file mode 100644
index 000000000000..56bd8ef2cba5
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/GalleryTargetExtendedLocation.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.Compute.Models
+{
+    public partial class GalleryTargetExtendedLocation
+    {
+        /// <summary> Specifies the storage account type to be used to store the image. This property is not updatable. </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public ImageStorageAccountType? StorageAccountType
+        {
+            get
+            {
+                return GalleryStorageAccountType.HasValue ? new ImageStorageAccountType(GalleryStorageAccountType.ToString()) : null;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    GalleryStorageAccountType = null;
+                }
+                else
+                {
+                    GalleryStorageAccountType = new EdgeZoneStorageAccountType(value.ToString());
+                }
+            }
+        }
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/ImageStorageAccountType.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/ImageStorageAccountType.cs
new file mode 100644
index 000000000000..7dadb9bcd3c3
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Customize/Models/ImageStorageAccountType.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.Compute.Models
+{
+    public readonly partial struct ImageStorageAccountType
+    {
+        private const string StandardSsdLrsValue = "StandardSSD_LRS";
+
+        /// <summary> StandardSSD_LRS. </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static ImageStorageAccountType StandardSsdLrs { get; } = new ImageStorageAccountType(StandardSsdLrsValue);
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/CommunityGalleryImageData.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/CommunityGalleryImageData.cs
index 97cd1988732f..55a3748d83c7 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/CommunityGalleryImageData.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/CommunityGalleryImageData.cs
@@ -32,7 +32,7 @@ internal CommunityGalleryImageData()
         /// <param name="osType"> This property allows you to specify the type of the OS that is included in the disk when creating a VM from a managed image. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. </param>
         /// <param name="osState"> This property allows the user to specify whether the virtual machines created under this image are &apos;Generalized&apos; or &apos;Specialized&apos;. </param>
         /// <param name="endOfLifeOn"> The end of life date of the gallery image definition. This property can be used for decommissioning purposes. This property is updatable. </param>
-        /// <param name="identifier"> This is the gallery image definition identifier. </param>
+        /// <param name="imageIdentifier"> This is the community gallery image definition identifier. </param>
         /// <param name="recommended"> The properties describe the recommended machine configuration for this Image Definition. These properties are updatable. </param>
         /// <param name="disallowed"> Describes the disallowed disk types. </param>
         /// <param name="hyperVGeneration"> The hypervisor generation of the Virtual Machine. Applicable to OS disks only. </param>
@@ -41,12 +41,12 @@ internal CommunityGalleryImageData()
         /// <param name="architecture"> The architecture of the image. Applicable to OS disks only. </param>
         /// <param name="privacyStatementUri"> Privacy statement uri for the current community gallery image. </param>
         /// <param name="eula"> End-user license agreement for the current community gallery image. </param>
-        internal CommunityGalleryImageData(string name, AzureLocation? location, ResourceType? resourceType, string uniqueId, SupportedOperatingSystemType? osType, OperatingSystemStateType? osState, DateTimeOffset? endOfLifeOn, GalleryImageIdentifier identifier, RecommendedMachineConfiguration recommended, Disallowed disallowed, HyperVGeneration? hyperVGeneration, IReadOnlyList<GalleryImageFeature> features, ImagePurchasePlan purchasePlan, ArchitectureType? architecture, Uri privacyStatementUri, string eula) : base(name, location, resourceType, uniqueId)
+        internal CommunityGalleryImageData(string name, AzureLocation? location, ResourceType? resourceType, string uniqueId, SupportedOperatingSystemType? osType, OperatingSystemStateType? osState, DateTimeOffset? endOfLifeOn, CommunityGalleryImageIdentifier imageIdentifier, RecommendedMachineConfiguration recommended, Disallowed disallowed, HyperVGeneration? hyperVGeneration, IReadOnlyList<GalleryImageFeature> features, ImagePurchasePlan purchasePlan, ArchitectureType? architecture, Uri privacyStatementUri, string eula) : base(name, location, resourceType, uniqueId)
         {
             OSType = osType;
             OSState = osState;
             EndOfLifeOn = endOfLifeOn;
-            Identifier = identifier;
+            ImageIdentifier = imageIdentifier;
             Recommended = recommended;
             Disallowed = disallowed;
             HyperVGeneration = hyperVGeneration;
@@ -63,8 +63,8 @@ internal CommunityGalleryImageData(string name, AzureLocation? location, Resourc
         public OperatingSystemStateType? OSState { get; }
         /// <summary> The end of life date of the gallery image definition. This property can be used for decommissioning purposes. This property is updatable. </summary>
         public DateTimeOffset? EndOfLifeOn { get; }
-        /// <summary> This is the gallery image definition identifier. </summary>
-        public GalleryImageIdentifier Identifier { get; }
+        /// <summary> This is the community gallery image definition identifier. </summary>
+        public CommunityGalleryImageIdentifier ImageIdentifier { get; }
         /// <summary> The properties describe the recommended machine configuration for this Image Definition. These properties are updatable. </summary>
         public RecommendedMachineConfiguration Recommended { get; }
         /// <summary> Describes the disallowed disk types. </summary>
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageData.Serialization.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageData.Serialization.cs
index bcc39efe3702..200b3dfa595c 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageData.Serialization.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageData.Serialization.cs
@@ -27,7 +27,7 @@ internal static CommunityGalleryImageData DeserializeCommunityGalleryImageData(J
             Optional<SupportedOperatingSystemType> osType = default;
             Optional<OperatingSystemStateType> osState = default;
             Optional<DateTimeOffset> endOfLifeDate = default;
-            Optional<GalleryImageIdentifier> identifier = default;
+            Optional<CommunityGalleryImageIdentifier> identifier = default;
             Optional<RecommendedMachineConfiguration> recommended = default;
             Optional<Disallowed> disallowed = default;
             Optional<HyperVGeneration> hyperVGeneration = default;
@@ -104,7 +104,7 @@ internal static CommunityGalleryImageData DeserializeCommunityGalleryImageData(J
                             {
                                 continue;
                             }
-                            identifier = GalleryImageIdentifier.DeserializeGalleryImageIdentifier(property0.Value);
+                            identifier = CommunityGalleryImageIdentifier.DeserializeCommunityGalleryImageIdentifier(property0.Value);
                             continue;
                         }
                         if (property0.NameEquals("recommended"u8))
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageIdentifier.Serialization.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageIdentifier.Serialization.cs
new file mode 100644
index 000000000000..65e28e58fa14
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageIdentifier.Serialization.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.ResourceManager.Compute.Models
+{
+    public partial class CommunityGalleryImageIdentifier
+    {
+        internal static CommunityGalleryImageIdentifier DeserializeCommunityGalleryImageIdentifier(JsonElement element)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Optional<string> publisher = default;
+            Optional<string> offer = default;
+            Optional<string> sku = default;
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("publisher"u8))
+                {
+                    publisher = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("offer"u8))
+                {
+                    offer = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("sku"u8))
+                {
+                    sku = property.Value.GetString();
+                    continue;
+                }
+            }
+            return new CommunityGalleryImageIdentifier(publisher.Value, offer.Value, sku.Value);
+        }
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageIdentifier.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageIdentifier.cs
new file mode 100644
index 000000000000..c17286c5c0b5
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/CommunityGalleryImageIdentifier.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+namespace Azure.ResourceManager.Compute.Models
+{
+    /// <summary> This is the community gallery image definition identifier. </summary>
+    public partial class CommunityGalleryImageIdentifier
+    {
+        /// <summary> Initializes a new instance of CommunityGalleryImageIdentifier. </summary>
+        internal CommunityGalleryImageIdentifier()
+        {
+        }
+
+        /// <summary> Initializes a new instance of CommunityGalleryImageIdentifier. </summary>
+        /// <param name="publisher"> The name of the gallery image definition publisher. </param>
+        /// <param name="offer"> The name of the gallery image definition offer. </param>
+        /// <param name="sku"> The name of the gallery image definition SKU. </param>
+        internal CommunityGalleryImageIdentifier(string publisher, string offer, string sku)
+        {
+            Publisher = publisher;
+            Offer = offer;
+            Sku = sku;
+        }
+
+        /// <summary> The name of the gallery image definition publisher. </summary>
+        public string Publisher { get; }
+        /// <summary> The name of the gallery image definition offer. </summary>
+        public string Offer { get; }
+        /// <summary> The name of the gallery image definition SKU. </summary>
+        public string Sku { get; }
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/EdgeZoneStorageAccountType.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/EdgeZoneStorageAccountType.cs
new file mode 100644
index 000000000000..d14b736bc77c
--- /dev/null
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/EdgeZoneStorageAccountType.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.Compute.Models
+{
+    /// <summary> Specifies the storage account type to be used to store the image. This property is not updatable. </summary>
+    public readonly partial struct EdgeZoneStorageAccountType : IEquatable<EdgeZoneStorageAccountType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="EdgeZoneStorageAccountType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public EdgeZoneStorageAccountType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string StandardLrsValue = "Standard_LRS";
+        private const string StandardZrsValue = "Standard_ZRS";
+        private const string StandardSsdLrsValue = "StandardSSD_LRS";
+        private const string PremiumLrsValue = "Premium_LRS";
+
+        /// <summary> Standard_LRS. </summary>
+        public static EdgeZoneStorageAccountType StandardLrs { get; } = new EdgeZoneStorageAccountType(StandardLrsValue);
+        /// <summary> Standard_ZRS. </summary>
+        public static EdgeZoneStorageAccountType StandardZrs { get; } = new EdgeZoneStorageAccountType(StandardZrsValue);
+        /// <summary> StandardSSD_LRS. </summary>
+        public static EdgeZoneStorageAccountType StandardSsdLrs { get; } = new EdgeZoneStorageAccountType(StandardSsdLrsValue);
+        /// <summary> Premium_LRS. </summary>
+        public static EdgeZoneStorageAccountType PremiumLrs { get; } = new EdgeZoneStorageAccountType(PremiumLrsValue);
+        /// <summary> Determines if two <see cref="EdgeZoneStorageAccountType"/> values are the same. </summary>
+        public static bool operator ==(EdgeZoneStorageAccountType left, EdgeZoneStorageAccountType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="EdgeZoneStorageAccountType"/> values are not the same. </summary>
+        public static bool operator !=(EdgeZoneStorageAccountType left, EdgeZoneStorageAccountType right) => !left.Equals(right);
+        /// <summary> Converts a string to a <see cref="EdgeZoneStorageAccountType"/>. </summary>
+        public static implicit operator EdgeZoneStorageAccountType(string value) => new EdgeZoneStorageAccountType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is EdgeZoneStorageAccountType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(EdgeZoneStorageAccountType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.Serialization.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.Serialization.cs
index 7b269a8ee7a7..55d97afc9f4a 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.Serialization.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.Serialization.cs
@@ -30,10 +30,10 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
                 writer.WritePropertyName("extendedLocationReplicaCount"u8);
                 writer.WriteNumberValue(ExtendedLocationReplicaCount.Value);
             }
-            if (Optional.IsDefined(StorageAccountType))
+            if (Optional.IsDefined(GalleryStorageAccountType))
             {
                 writer.WritePropertyName("storageAccountType"u8);
-                writer.WriteStringValue(StorageAccountType.Value.ToString());
+                writer.WriteStringValue(GalleryStorageAccountType.Value.ToString());
             }
             if (Optional.IsDefined(Encryption))
             {
@@ -52,7 +52,7 @@ internal static GalleryTargetExtendedLocation DeserializeGalleryTargetExtendedLo
             Optional<string> name = default;
             Optional<GalleryExtendedLocation> extendedLocation = default;
             Optional<int> extendedLocationReplicaCount = default;
-            Optional<ImageStorageAccountType> storageAccountType = default;
+            Optional<EdgeZoneStorageAccountType> storageAccountType = default;
             Optional<EncryptionImages> encryption = default;
             foreach (var property in element.EnumerateObject())
             {
@@ -85,7 +85,7 @@ internal static GalleryTargetExtendedLocation DeserializeGalleryTargetExtendedLo
                     {
                         continue;
                     }
-                    storageAccountType = new ImageStorageAccountType(property.Value.GetString());
+                    storageAccountType = new EdgeZoneStorageAccountType(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("encryption"u8))
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.cs
index 27d8275fc421..dbfb93ebfb37 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/GalleryTargetExtendedLocation.cs
@@ -19,14 +19,14 @@ public GalleryTargetExtendedLocation()
         /// <param name="name"> The name of the region. </param>
         /// <param name="extendedLocation"> The name of the extended location. </param>
         /// <param name="extendedLocationReplicaCount"> The number of replicas of the Image Version to be created per extended location. This property is updatable. </param>
-        /// <param name="storageAccountType"> Specifies the storage account type to be used to store the image. This property is not updatable. </param>
+        /// <param name="galleryStorageAccountType"> Specifies the storage account type to be used to store the image. This property is not updatable. </param>
         /// <param name="encryption"> Optional. Allows users to provide customer managed keys for encrypting the OS and data disks in the gallery artifact. </param>
-        internal GalleryTargetExtendedLocation(string name, GalleryExtendedLocation extendedLocation, int? extendedLocationReplicaCount, ImageStorageAccountType? storageAccountType, EncryptionImages encryption)
+        internal GalleryTargetExtendedLocation(string name, GalleryExtendedLocation extendedLocation, int? extendedLocationReplicaCount, EdgeZoneStorageAccountType? galleryStorageAccountType, EncryptionImages encryption)
         {
             Name = name;
             ExtendedLocation = extendedLocation;
             ExtendedLocationReplicaCount = extendedLocationReplicaCount;
-            StorageAccountType = storageAccountType;
+            GalleryStorageAccountType = galleryStorageAccountType;
             Encryption = encryption;
         }
 
@@ -37,7 +37,7 @@ internal GalleryTargetExtendedLocation(string name, GalleryExtendedLocation exte
         /// <summary> The number of replicas of the Image Version to be created per extended location. This property is updatable. </summary>
         public int? ExtendedLocationReplicaCount { get; set; }
         /// <summary> Specifies the storage account type to be used to store the image. This property is not updatable. </summary>
-        public ImageStorageAccountType? StorageAccountType { get; set; }
+        public EdgeZoneStorageAccountType? GalleryStorageAccountType { get; set; }
         /// <summary> Optional. Allows users to provide customer managed keys for encrypting the OS and data disks in the gallery artifact. </summary>
         public EncryptionImages Encryption { get; set; }
     }
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/ImageStorageAccountType.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/ImageStorageAccountType.cs
index bd4a6f4c0a69..fe617915f3c4 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/ImageStorageAccountType.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Models/ImageStorageAccountType.cs
@@ -25,7 +25,6 @@ public ImageStorageAccountType(string value)
         private const string StandardLrsValue = "Standard_LRS";
         private const string StandardZrsValue = "Standard_ZRS";
         private const string PremiumLrsValue = "Premium_LRS";
-        private const string StandardSsdLrsValue = "StandardSSD_LRS";
 
         /// <summary> Standard_LRS. </summary>
         public static ImageStorageAccountType StandardLrs { get; } = new ImageStorageAccountType(StandardLrsValue);
@@ -33,8 +32,6 @@ public ImageStorageAccountType(string value)
         public static ImageStorageAccountType StandardZrs { get; } = new ImageStorageAccountType(StandardZrsValue);
         /// <summary> Premium_LRS. </summary>
         public static ImageStorageAccountType PremiumLrs { get; } = new ImageStorageAccountType(PremiumLrsValue);
-        /// <summary> StandardSSD_LRS. </summary>
-        public static ImageStorageAccountType StandardSsdLrs { get; } = new ImageStorageAccountType(StandardSsdLrsValue);
         /// <summary> Determines if two <see cref="ImageStorageAccountType"/> values are the same. </summary>
         public static bool operator ==(ImageStorageAccountType left, ImageStorageAccountType right) => left.Equals(right);
         /// <summary> Determines if two <see cref="ImageStorageAccountType"/> values are not the same. </summary>
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/autorest.md b/sdk/compute/Azure.ResourceManager.Compute/src/autorest.md
index 1dbfdb18c482..313c93031c88 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/autorest.md
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/autorest.md
@@ -11,7 +11,7 @@ azure-arm: true
 generate-model-factory: false
 library-name: Compute
 namespace: Azure.ResourceManager.Compute
-require: https://github.com/Azure/azure-rest-api-specs/blob/b06a6f45e472dd07c2e0dab06b1e52dfe2684c88/specification/compute/resource-manager/readme.md
+require: https://github.com/Azure/azure-rest-api-specs/blob/a2140e7ff0a6c28df501b16c51fe85b762a386fc/specification/compute/resource-manager/readme.md
 output-folder: $(this-folder)/Generated
 clear-output-folder: true
 skip-csproj: true
@@ -120,8 +120,8 @@ prepend-rp-prefix:
 - PublicIPAddressSkuTier
 - StatusLevelTypes
 
-#mgmt-debug:
-#    show-serialized-names: true
+# mgmt-debug:
+#   show-serialized-names: true
 
 rename-mapping:
   DiskSecurityTypes.ConfidentialVM_VMGuestStateOnlyEncryptedWithPlatformKey: ConfidentialVmGuestStateOnlyEncryptedWithPlatformKey
@@ -263,6 +263,8 @@ rename-mapping:
   SecurityPostureReference: ComputeSecurityPostureReference
   RestorePointSourceVmStorageProfile.dataDisks: DataDiskList
   SecurityPostureReference.id: -|arm-id
+  CommunityGalleryImage.properties.identifier: ImageIdentifier
+  GalleryTargetExtendedLocation.storageAccountType: GalleryStorageAccountType
 
 directive:
 # copy the systemData from common-types here so that it will be automatically replaced