diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/PostgresqlFlexibleservers.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/PostgresqlFlexibleservers.json
index be0db2d79c54..3b671faeb831 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/PostgresqlFlexibleservers.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/PostgresqlFlexibleservers.json
@@ -1159,6 +1159,7 @@
       "description": "Server version capabilities."
     },
     "StorageEditionCapability": {
+      "type": "object",
       "properties": {
         "name": {
           "type": "string",
@@ -1274,6 +1275,7 @@
       "description": "Hyperscale node edition capabilities."
     },
     "CapabilityProperties": {
+      "type": "object",
       "properties": {
         "zone": {
           "type": "string",
@@ -1350,6 +1352,7 @@
       }
     },
     "ServerProperties": {
+      "type": "object",
       "properties": {
         "administratorLogin": {
           "type": "string",
@@ -1481,6 +1484,7 @@
       "description": "The properties of a server."
     },
     "Server": {
+      "type": "object",
       "properties": {
         "identity": {
           "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity",
@@ -1509,6 +1513,7 @@
       "description": "Represents a server."
     },
     "ServerPropertiesForUpdate": {
+      "type": "object",
       "properties": {
         "administratorLoginPassword": {
           "type": "string",
@@ -1549,6 +1554,7 @@
       }
     },
     "ServerForUpdate": {
+      "type": "object",
       "properties": {
         "location": {
           "type": "string",
@@ -1591,6 +1597,7 @@
       "description": "A list of servers."
     },
     "Sku": {
+      "type": "object",
       "properties": {
         "name": {
           "type": "string",
@@ -1617,6 +1624,7 @@
       "description": "Sku information related properties of a server."
     },
     "Storage": {
+      "type": "object",
       "properties": {
         "storageSizeGB": {
           "type": "integer",
@@ -1627,6 +1635,7 @@
       "description": "Storage properties of a server"
     },
     "Backup": {
+      "type": "object",
       "properties": {
         "backupRetentionDays": {
           "type": "integer",
@@ -1659,6 +1668,7 @@
       "description": "Backup properties of a server"
     },
     "Network": {
+      "type": "object",
       "properties": {
         "publicNetworkAccess": {
           "type": "string",
@@ -1693,6 +1703,7 @@
       "description": "Network properties of a server"
     },
     "HighAvailability": {
+      "type": "object",
       "properties": {
         "mode": {
           "type": "string",
@@ -1756,6 +1767,7 @@
       }
     },
     "FirewallRuleProperties": {
+      "type": "object",
       "properties": {
         "startIpAddress": {
           "type": "string",
@@ -1775,6 +1787,7 @@
       "description": "The properties of a server firewall rule."
     },
     "FirewallRule": {
+      "type": "object",
       "properties": {
         "properties": {
           "$ref": "#/definitions/FirewallRuleProperties",
@@ -1815,6 +1828,7 @@
       "description": "A list of firewall rules."
     },
     "ConfigurationProperties": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "string",
@@ -1858,6 +1872,7 @@
       "description": "The properties of a configuration."
     },
     "Configuration": {
+      "type": "object",
       "properties": {
         "properties": {
           "$ref": "#/definitions/ConfigurationProperties",
@@ -1895,6 +1910,7 @@
       "description": "A list of server configurations."
     },
     "OperationDisplay": {
+      "type": "object",
       "properties": {
         "provider": {
           "type": "string",
@@ -1920,6 +1936,7 @@
       "description": "Display metadata associated with the operation."
     },
     "Operation": {
+      "type": "object",
       "properties": {
         "name": {
           "type": "string",
@@ -1983,6 +2000,7 @@
       "required": [
         "name"
       ],
+      "type": "object",
       "properties": {
         "name": {
           "type": "string",
@@ -1996,6 +2014,7 @@
       "description": "Request from client to check resource name availability."
     },
     "NameAvailability": {
+      "type": "object",
       "properties": {
         "message": {
           "type": "string",
@@ -2031,6 +2050,7 @@
       "description": "Represents server restart parameters."
     },
     "CloudError": {
+      "type": "object",
       "x-ms-external": true,
       "properties": {
         "error": {