diff --git a/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts b/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts
index d6c4ade44350..edbe52d72d8e 100644
--- a/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts
+++ b/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts
@@ -55,7 +55,7 @@ export interface HardwareProfile {
   /**
    * Specifies the HANA instance SKU. Possible values include: 'S72m', 'S144m', 'S72', 'S144',
    * 'S192', 'S192m', 'S192xm', 'S96', 'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m', 'S576xm',
-   * 'S768', 'S768m', 'S768xm', 'S960m'
+   * 'S768', 'S768m', 'S768xm', 'S960m', 'S224o', 'S224m', 'S224om', 'S224oxm', 'S224oxxm'
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly hanaInstanceSize?: HanaInstanceSizeNamesEnum;
@@ -270,26 +270,21 @@ export interface Tags {
  */
 export interface MonitoringDetails {
   /**
-   * ARM ID of an Azure Vnet with access to the HANA instance.
+   * ARM ID of an Azure Subnet with access to the HANA instance.
    */
-  hanaVnet?: string;
+  hanaSubnet?: string;
   /**
    * Hostname of the HANA Instance blade.
    */
   hanaHostname?: string;
   /**
-   * A number between 00 and 99, stored as a string to maintain leading zero.
+   * Name of the database itself.
    */
-  hanaInstanceNum?: string;
+  hanaDbName?: string;
   /**
-   * Either single or multiple depending on the use of MDC(Multiple Database Containers). Possible
-   * values include: 'single', 'multiple'. Default value: 'single'.
+   * The port number of the tenant DB. Used to connect to the DB.
    */
-  dbContainer?: HanaDatabaseContainersEnum;
-  /**
-   * Name of the database itself.  It only needs to be specified if using MDC
-   */
-  hanaDatabase?: string;
+  hanaDbSqlPort?: number;
   /**
    * Username for the HANA database to login to for monitoring
    */
@@ -338,11 +333,12 @@ export type HanaHardwareTypeNamesEnum = 'Cisco_UCS' | 'HPE';
 /**
  * Defines values for HanaInstanceSizeNamesEnum.
  * Possible values include: 'S72m', 'S144m', 'S72', 'S144', 'S192', 'S192m', 'S192xm', 'S96',
- * 'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m', 'S576xm', 'S768', 'S768m', 'S768xm', 'S960m'
+ * 'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m', 'S576xm', 'S768', 'S768m', 'S768xm', 'S960m',
+ * 'S224o', 'S224m', 'S224om', 'S224oxm', 'S224oxxm'
  * @readonly
  * @enum {string}
  */
-export type HanaInstanceSizeNamesEnum = 'S72m' | 'S144m' | 'S72' | 'S144' | 'S192' | 'S192m' | 'S192xm' | 'S96' | 'S384' | 'S384m' | 'S384xm' | 'S384xxm' | 'S576m' | 'S576xm' | 'S768' | 'S768m' | 'S768xm' | 'S960m';
+export type HanaInstanceSizeNamesEnum = 'S72m' | 'S144m' | 'S72' | 'S144' | 'S192' | 'S192m' | 'S192xm' | 'S96' | 'S384' | 'S384m' | 'S384xm' | 'S384xxm' | 'S576m' | 'S576xm' | 'S768' | 'S768m' | 'S768xm' | 'S960m' | 'S224o' | 'S224m' | 'S224om' | 'S224oxm' | 'S224oxxm';
 
 /**
  * Defines values for HanaInstancePowerStateEnum.
@@ -352,14 +348,6 @@ export type HanaInstanceSizeNamesEnum = 'S72m' | 'S144m' | 'S72' | 'S144' | 'S19
  */
 export type HanaInstancePowerStateEnum = 'starting' | 'started' | 'stopping' | 'stopped' | 'restarting' | 'unknown';
 
-/**
- * Defines values for HanaDatabaseContainersEnum.
- * Possible values include: 'single', 'multiple'
- * @readonly
- * @enum {string}
- */
-export type HanaDatabaseContainersEnum = 'single' | 'multiple';
-
 /**
  * Contains response data for the list operation.
  */
diff --git a/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts b/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts
index eb11261c1a5f..6c6227285e62 100644
--- a/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts
+++ b/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts
@@ -406,8 +406,8 @@ export const MonitoringDetails: msRest.CompositeMapper = {
     name: "Composite",
     className: "MonitoringDetails",
     modelProperties: {
-      hanaVnet: {
-        serializedName: "hanaVnet",
+      hanaSubnet: {
+        serializedName: "hanaSubnet",
         type: {
           name: "String"
         }
@@ -418,23 +418,16 @@ export const MonitoringDetails: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      hanaInstanceNum: {
-        serializedName: "hanaInstanceNum",
+      hanaDbName: {
+        serializedName: "hanaDbName",
         type: {
           name: "String"
         }
       },
-      dbContainer: {
-        serializedName: "dbContainer",
-        defaultValue: 'single',
+      hanaDbSqlPort: {
+        serializedName: "hanaDbSqlPort",
         type: {
-          name: "String"
-        }
-      },
-      hanaDatabase: {
-        serializedName: "hanaDatabase",
-        type: {
-          name: "String"
+          name: "Number"
         }
       },
       hanaDbUsername: {