diff --git a/packages/@azure/arm-compute/lib/models/index.ts b/packages/@azure/arm-compute/lib/models/index.ts
index db372dc0b09a..5836f42ab1ee 100644
--- a/packages/@azure/arm-compute/lib/models/index.ts
+++ b/packages/@azure/arm-compute/lib/models/index.ts
@@ -5411,6 +5411,12 @@ export interface GalleryImageVersionPublishingProfile extends GalleryArtifactPub
    * property is updatable.
    */
   endOfLifeDate?: Date;
+  /**
+   * @member {StorageAccountType} [storageAccountType] Specifies the storage
+   * account type to be used to store the image. This property is not
+   * updatable. Possible values include: 'Standard_LRS', 'Standard_ZRS'
+   */
+  storageAccountType?: StorageAccountType;
 }
 
 /**
@@ -5597,6 +5603,12 @@ export interface TargetRegion {
    * Image Version to be created per region. This property is updatable.
    */
   regionalReplicaCount?: number;
+  /**
+   * @member {StorageAccountType} [storageAccountType] Specifies the storage
+   * account type to be used to store the image. This property is not
+   * updatable. Possible values include: 'Standard_LRS', 'Standard_ZRS'
+   */
+  storageAccountType?: StorageAccountType;
 }
 
 /**
@@ -6978,6 +6990,14 @@ export type SnapshotStorageAccountTypes = 'Standard_LRS' | 'Premium_LRS' | 'Stan
  */
 export type AccessLevel = 'None' | 'Read' | 'Write';
 
+/**
+ * Defines values for StorageAccountType.
+ * Possible values include: 'Standard_LRS', 'Standard_ZRS'
+ * @readonly
+ * @enum {string}
+ */
+export type StorageAccountType = 'Standard_LRS' | 'Standard_ZRS';
+
 /**
  * Defines values for AggregatedReplicationState.
  * Possible values include: 'Unknown', 'InProgress', 'Completed', 'Failed'
diff --git a/packages/@azure/arm-compute/lib/models/mappers.ts b/packages/@azure/arm-compute/lib/models/mappers.ts
index 9127ff5ba451..f0eca89f1c26 100644
--- a/packages/@azure/arm-compute/lib/models/mappers.ts
+++ b/packages/@azure/arm-compute/lib/models/mappers.ts
@@ -6683,6 +6683,12 @@ export const GalleryImageVersionPublishingProfile: msRest.CompositeMapper = {
         type: {
           name: "DateTime"
         }
+      },
+      storageAccountType: {
+        serializedName: "storageAccountType",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -6905,6 +6911,12 @@ export const TargetRegion: msRest.CompositeMapper = {
         type: {
           name: "Number"
         }
+      },
+      storageAccountType: {
+        serializedName: "storageAccountType",
+        type: {
+          name: "String"
+        }
       }
     }
   }
diff --git a/packages/@azure/arm-compute/lib/models/parameters.ts b/packages/@azure/arm-compute/lib/models/parameters.ts
index adfa4838ec17..af5df6796165 100644
--- a/packages/@azure/arm-compute/lib/models/parameters.ts
+++ b/packages/@azure/arm-compute/lib/models/parameters.ts
@@ -57,18 +57,6 @@ export const apiVersion2: msRest.OperationQueryParameter = {
   }
 };
 export const apiVersion3: msRest.OperationQueryParameter = {
-  parameterPath: "apiVersion",
-  mapper: {
-    required: true,
-    isConstant: true,
-    serializedName: "api-version",
-    defaultValue: '2018-06-01',
-    type: {
-      name: "String"
-    }
-  }
-};
-export const apiVersion4: msRest.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
diff --git a/packages/@azure/arm-compute/lib/operations/containerServices.ts b/packages/@azure/arm-compute/lib/operations/containerServices.ts
index a0b681fc5406..fb409253f04a 100644
--- a/packages/@azure/arm-compute/lib/operations/containerServices.ts
+++ b/packages/@azure/arm-compute/lib/operations/containerServices.ts
@@ -274,7 +274,7 @@ const listOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion4
+    Parameters.apiVersion3
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -299,7 +299,7 @@ const getOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion4
+    Parameters.apiVersion3
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -323,7 +323,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion4
+    Parameters.apiVersion3
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -348,7 +348,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion4
+    Parameters.apiVersion3
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -386,7 +386,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion4
+    Parameters.apiVersion3
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/packages/@azure/arm-compute/lib/operations/galleries.ts b/packages/@azure/arm-compute/lib/operations/galleries.ts
index 3ed0099d5551..bf566595c4a2 100644
--- a/packages/@azure/arm-compute/lib/operations/galleries.ts
+++ b/packages/@azure/arm-compute/lib/operations/galleries.ts
@@ -244,7 +244,7 @@ const getOperationSpec: msRest.OperationSpec = {
     Parameters.galleryName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -268,7 +268,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.resourceGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -291,7 +291,7 @@ const listOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -316,7 +316,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.galleryName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -354,7 +354,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.galleryName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts b/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts
index 78864ec5df03..02c415f95c6e 100644
--- a/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts
+++ b/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts
@@ -237,7 +237,7 @@ const getOperationSpec: msRest.OperationSpec = {
   ],
   queryParameters: [
     Parameters.expand0,
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -263,7 +263,7 @@ const listByGalleryImageOperationSpec: msRest.OperationSpec = {
     Parameters.galleryImageName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -290,7 +290,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.galleryImageVersionName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -330,7 +330,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.galleryImageVersionName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/packages/@azure/arm-compute/lib/operations/galleryImages.ts b/packages/@azure/arm-compute/lib/operations/galleryImages.ts
index b951008c54f7..1205d3f7d769 100644
--- a/packages/@azure/arm-compute/lib/operations/galleryImages.ts
+++ b/packages/@azure/arm-compute/lib/operations/galleryImages.ts
@@ -219,7 +219,7 @@ const getOperationSpec: msRest.OperationSpec = {
     Parameters.galleryImageName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -244,7 +244,7 @@ const listByGalleryOperationSpec: msRest.OperationSpec = {
     Parameters.galleryName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -270,7 +270,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.galleryImageName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -309,7 +309,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.galleryImageName
   ],
   queryParameters: [
-    Parameters.apiVersion3
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage