diff --git a/schemas/2021-12-01-preview/Microsoft.Workloads.json b/schemas/2021-12-01-preview/Microsoft.Workloads.json
index b2a2bb203b..d4901cb01b 100644
--- a/schemas/2021-12-01-preview/Microsoft.Workloads.json
+++ b/schemas/2021-12-01-preview/Microsoft.Workloads.json
@@ -694,29 +694,6 @@
       ],
       "description": "Gets or sets the central server configuration."
     },
-    "CreateAndMountFileShareConfiguration": {
-      "type": "object",
-      "properties": {
-        "configurationType": {
-          "type": "string",
-          "enum": [
-            "CreateAndMount"
-          ]
-        },
-        "resourceGroup": {
-          "type": "string",
-          "description": "The name of file share resource group. The app rg is used in case of missing input."
-        },
-        "storageAccountName": {
-          "type": "string",
-          "description": "The name of file share storage account name . A custom name is used in case of missing input."
-        }
-      },
-      "required": [
-        "configurationType"
-      ],
-      "description": "Gets or sets the file share configuration for file share created with the VIS case."
-    },
     "DatabaseConfiguration": {
       "type": "object",
       "properties": {
@@ -735,17 +712,6 @@
           ],
           "description": "The database type."
         },
-        "diskConfiguration": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DiskConfiguration"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The Disk Configuration Details."
-        },
         "instanceCount": {
           "oneOf": [
             {
@@ -1089,27 +1055,6 @@
       ],
       "description": "Discovery Details."
     },
-    "DiskConfiguration": {
-      "type": "object",
-      "properties": {
-        "diskVolumeConfigurations": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "$ref": "#/definitions/DiskVolumeConfiguration"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The disk configuration for the db volume. For HANA, Required volumes are: ['hana/data', 'hana/log', hana/shared', 'usr/sap', 'os'], Optional volume : ['backup']."
-        }
-      },
-      "description": "The Disk Configuration Details."
-    },
     "DiskInfo": {
       "type": "object",
       "properties": {
@@ -1146,70 +1091,6 @@
       ],
       "description": "Disk resource creation details"
     },
-    "DiskSku": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Standard_LRS",
-                "Premium_LRS",
-                "StandardSSD_LRS",
-                "UltraSSD_LRS",
-                "Premium_ZRS",
-                "StandardSSD_ZRS",
-                "PremiumV2_LRS"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        }
-      },
-      "description": "The disk sku."
-    },
-    "DiskVolumeConfiguration": {
-      "type": "object",
-      "properties": {
-        "count": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The total number of disks required for the concerned volume."
-        },
-        "sizeGB": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The disk size in GB."
-        },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DiskSku"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The disk sku."
-        }
-      },
-      "description": "The disk configuration required for the selected volume."
-    },
     "EnqueueReplicationServerProperties": {
       "type": "object",
       "properties": {},
@@ -1239,22 +1120,6 @@
       ],
       "description": "The SAP Software configuration Input when the software is installed externally outside the service."
     },
-    "FileShareConfiguration": {
-      "type": "object",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/SkipFileShareConfiguration"
-        },
-        {
-          "$ref": "#/definitions/CreateAndMountFileShareConfiguration"
-        },
-        {
-          "$ref": "#/definitions/MountFileShareConfiguration"
-        }
-      ],
-      "properties": {},
-      "description": "File Share configuration details, populated with information on storage configuration mounted on the VIS. The createAndMount option is selected in case of missing input."
-    },
     "FileshareProfile": {
       "type": "object",
       "properties": {
@@ -1634,31 +1499,6 @@
       ],
       "description": "Microsoft.Workloads/monitors/providerInstances"
     },
-    "MountFileShareConfiguration": {
-      "type": "object",
-      "properties": {
-        "configurationType": {
-          "type": "string",
-          "enum": [
-            "Mount"
-          ]
-        },
-        "id": {
-          "type": "string",
-          "description": "The fileshare resource ID"
-        },
-        "privateEndpointId": {
-          "type": "string",
-          "description": "The private endpoint resource ID"
-        }
-      },
-      "required": [
-        "configurationType",
-        "id",
-        "privateEndpointId"
-      ],
-      "description": "Gets or sets the file share configuration for externally mounted cases."
-    },
     "MsSqlServerProviderInstanceProperties": {
       "type": "object",
       "properties": {
@@ -2933,17 +2773,6 @@
           ],
           "description": "The database type."
         },
-        "dbDiskConfiguration": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DiskConfiguration"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The Disk Configuration Details."
-        },
         "deploymentType": {
           "type": "string",
           "enum": [
@@ -2994,21 +2823,6 @@
       },
       "description": "Workload website profile"
     },
-    "SkipFileShareConfiguration": {
-      "type": "object",
-      "properties": {
-        "configurationType": {
-          "type": "string",
-          "enum": [
-            "Skip"
-          ]
-        }
-      },
-      "required": [
-        "configurationType"
-      ],
-      "description": "Gets or sets the skip file share configuration"
-    },
     "Sku": {
       "type": "object",
       "properties": {
@@ -3117,23 +2931,6 @@
       },
       "description": "Contains information about SSH certificate public key and the path on the Linux VM where the public key is placed."
     },
-    "StorageConfiguration": {
-      "type": "object",
-      "properties": {
-        "transportFileShareConfiguration": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/FileShareConfiguration"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "File Share configuration details, populated with information on storage configuration mounted on the VIS. The createAndMount option is selected in case of missing input."
-        }
-      },
-      "description": "Gets or sets the storage configuration."
-    },
     "ThreeTierConfiguration": {
       "type": "object",
       "properties": {
@@ -3197,17 +2994,6 @@
             }
           ],
           "description": "Defines the network configuration type for SAP system infrastructure that is being deployed "
-        },
-        "storageConfiguration": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/StorageConfiguration"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Gets or sets the storage configuration."
         }
       },
       "required": [