diff --git a/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json b/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json
deleted file mode 100644
index 55d32fb8d1..0000000000
--- a/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json
+++ /dev/null
@@ -1,920 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBforPostgreSQL",
-  "description": "Microsoft DBforPostgreSQL Resource Types",
-  "resourceDefinitions": {
-    "serverGroupsv2": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^(?![0-9]+$)(?!-)[a-z0-9-]{3,40}(?<!-)$",
-              "minLength": 3,
-              "maxLength": 40
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ClusterProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of the cluster."
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/serverGroupsv2_coordinatorConfigurations_childResource"
-              },
-              {
-                "$ref": "#/definitions/serverGroupsv2_nodeConfigurations_childResource"
-              },
-              {
-                "$ref": "#/definitions/serverGroupsv2_firewallRules_childResource"
-              },
-              {
-                "$ref": "#/definitions/serverGroupsv2_roles_childResource"
-              },
-              {
-                "$ref": "#/definitions/serverGroupsv2_privateEndpointConnections_childResource"
-              }
-            ]
-          }
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Resource tags."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/serverGroupsv2"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2"
-    },
-    "serverGroupsv2_coordinatorConfigurations": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$",
-              "minLength": 1,
-              "maxLength": 90
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster configuration."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerConfigurationProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a configuration."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/serverGroupsv2/coordinatorConfigurations"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/coordinatorConfigurations"
-    },
-    "serverGroupsv2_firewallRules": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster firewall rule."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/FirewallRuleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a cluster firewall rule."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules"
-    },
-    "serverGroupsv2_nodeConfigurations": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$",
-              "minLength": 1,
-              "maxLength": 90
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster configuration."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerConfigurationProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a configuration."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/serverGroupsv2/nodeConfigurations"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/nodeConfigurations"
-    },
-    "serverGroupsv2_privateEndpointConnections": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the private endpoint connection associated with the cluster."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of the private endpoint connection."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/serverGroupsv2/privateEndpointConnections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/privateEndpointConnections"
-    },
-    "serverGroupsv2_roles": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster role."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/RoleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a cluster role."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/serverGroupsv2/roles"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles"
-    }
-  },
-  "definitions": {
-    "ClusterProperties": {
-      "type": "object",
-      "properties": {
-        "administratorLoginPassword": {
-          "type": "string",
-          "format": "password",
-          "description": "The password of the administrator login. Required for creation."
-        },
-        "citusVersion": {
-          "type": "string",
-          "description": "The Citus extension version on all cluster servers."
-        },
-        "coordinatorEnablePublicIpAccess": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "If public access is enabled on coordinator."
-        },
-        "coordinatorServerEdition": {
-          "type": "string",
-          "description": "The edition of a coordinator server (default: GeneralPurpose). Required for creation."
-        },
-        "coordinatorStorageQuotaInMb": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The storage of a server in MB. Required for creation. See https://learn.microsoft.com/azure/cosmos-db/postgresql/resources-compute for more information."
-        },
-        "coordinatorVCores": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The vCores count of a server (max: 96). Required for creation. See https://learn.microsoft.com/azure/cosmos-db/postgresql/resources-compute for more information."
-        },
-        "enableHa": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "If high availability (HA) is enabled or not for the cluster."
-        },
-        "enableShardsOnCoordinator": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "If shards on coordinator is enabled or not for the cluster."
-        },
-        "maintenanceWindow": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/MaintenanceWindow"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Schedule settings for regular cluster updates."
-        },
-        "nodeCount": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Worker node count of the cluster. When node count is 0, it represents a single node configuration with the ability to create distributed tables on that node. 2 or more worker nodes represent multi-node configuration. Node count value cannot be 1. Required for creation."
-        },
-        "nodeEnablePublicIpAccess": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "If public access is enabled on worker nodes."
-        },
-        "nodeServerEdition": {
-          "type": "string",
-          "description": "The edition of a node server (default: MemoryOptimized)."
-        },
-        "nodeStorageQuotaInMb": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The storage in MB on each worker node. See https://learn.microsoft.com/azure/cosmos-db/postgresql/resources-compute for more information."
-        },
-        "nodeVCores": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The compute in vCores on each worker node (max: 104). See https://learn.microsoft.com/azure/cosmos-db/postgresql/resources-compute for more information."
-        },
-        "pointInTimeUTC": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Date and time in UTC (ISO8601 format) for cluster restore."
-        },
-        "postgresqlVersion": {
-          "type": "string",
-          "description": "The major PostgreSQL version on all cluster servers."
-        },
-        "preferredPrimaryZone": {
-          "type": "string",
-          "description": "Preferred primary availability zone (AZ) for all cluster servers."
-        },
-        "sourceLocation": {
-          "type": "string",
-          "description": "The Azure region of source cluster for read replica clusters."
-        },
-        "sourceResourceId": {
-          "type": "string",
-          "description": "The resource id of source cluster for read replica clusters."
-        }
-      },
-      "description": "Properties of the cluster."
-    },
-    "FirewallRuleProperties": {
-      "type": "object",
-      "properties": {
-        "endIpAddress": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The end IP address of the cluster firewall rule. Must be IPv4 format."
-        },
-        "startIpAddress": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The start IP address of the cluster firewall rule. Must be IPv4 format."
-        }
-      },
-      "required": [
-        "endIpAddress",
-        "startIpAddress"
-      ],
-      "description": "The properties of a cluster firewall rule."
-    },
-    "MaintenanceWindow": {
-      "type": "object",
-      "properties": {
-        "customWindow": {
-          "type": "string",
-          "description": "Indicates whether custom maintenance window is enabled or not."
-        },
-        "dayOfWeek": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Preferred day of the week for maintenance window."
-        },
-        "startHour": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Start hour within preferred day of the week for maintenance window."
-        },
-        "startMinute": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Start minute within the start hour for maintenance window."
-        }
-      },
-      "description": "Schedule settings for regular cluster updates."
-    },
-    "PrivateEndpoint": {
-      "type": "object",
-      "properties": {},
-      "description": "The private endpoint resource."
-    },
-    "PrivateEndpointConnectionProperties": {
-      "type": "object",
-      "properties": {
-        "privateEndpoint": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpoint"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The private endpoint resource."
-        },
-        "privateLinkServiceConnectionState": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateLinkServiceConnectionState"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A collection of information about the state of the connection between service consumer and provider."
-        },
-        "provisioningState": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Succeeded",
-                "Creating",
-                "Deleting",
-                "Failed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The provisioning state of the private endpoint connection resource."
-        }
-      },
-      "required": [
-        "privateLinkServiceConnectionState"
-      ],
-      "description": "Properties of the private endpoint connection."
-    },
-    "PrivateLinkServiceConnectionState": {
-      "type": "object",
-      "properties": {
-        "actionsRequired": {
-          "type": "string",
-          "description": "A message indicating if changes on the service provider require any updates on the consumer."
-        },
-        "description": {
-          "type": "string",
-          "description": "The reason for approval/rejection of the connection."
-        },
-        "status": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Pending",
-                "Approved",
-                "Rejected"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service."
-        }
-      },
-      "description": "A collection of information about the state of the connection between service consumer and provider."
-    },
-    "RoleProperties": {
-      "type": "object",
-      "properties": {
-        "password": {
-          "type": "string",
-          "format": "password",
-          "description": "The password of the cluster role."
-        }
-      },
-      "required": [
-        "password"
-      ],
-      "description": "The properties of a cluster role."
-    },
-    "ServerConfigurationProperties": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "string",
-          "description": "Value of the configuration."
-        }
-      },
-      "required": [
-        "value"
-      ],
-      "description": "The properties of a configuration."
-    },
-    "serverGroupsv2_coordinatorConfigurations_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$",
-              "minLength": 1,
-              "maxLength": 90
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster configuration."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerConfigurationProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a configuration."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "coordinatorConfigurations"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/coordinatorConfigurations"
-    },
-    "serverGroupsv2_firewallRules_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster firewall rule."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/FirewallRuleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a cluster firewall rule."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "firewallRules"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules"
-    },
-    "serverGroupsv2_nodeConfigurations_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$",
-              "minLength": 1,
-              "maxLength": 90
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster configuration."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerConfigurationProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a configuration."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "nodeConfigurations"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/nodeConfigurations"
-    },
-    "serverGroupsv2_privateEndpointConnections_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the private endpoint connection associated with the cluster."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of the private endpoint connection."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "privateEndpointConnections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/privateEndpointConnections"
-    },
-    "serverGroupsv2_roles_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2022-11-08"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._]+$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the cluster role."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/RoleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a cluster role."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "roles"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles"
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2022-12-01/Microsoft.DBforPostgreSQL.json b/schemas/2022-12-01/Microsoft.DBforPostgreSQL.json
index fc9310a8bf..f2467514e9 100644
--- a/schemas/2022-12-01/Microsoft.DBforPostgreSQL.json
+++ b/schemas/2022-12-01/Microsoft.DBforPostgreSQL.json
@@ -773,16 +773,14 @@
       "properties": {
         "delegatedSubnetResourceId": {
           "type": "string",
-          "default": "",
-          "description": "delegated subnet arm resource id."
+          "description": "Delegated subnet arm resource id. This is required to be passed during create, in case we want the server to be VNET injected, i.e. Private access server. During update, pass this only if we want to update the value for Private DNS zone."
         },
         "privateDnsZoneArmResourceId": {
           "type": "string",
-          "default": "",
-          "description": "private dns zone arm resource id."
+          "description": "Private dns zone arm resource id. This is required to be passed during create, in case we want the server to be VNET injected, i.e. Private access server. During update, pass this only if we want to update the value for Private DNS zone."
         }
       },
-      "description": "Network properties of a server"
+      "description": "Network properties of a server."
     },
     "ServerProperties": {
       "type": "object",
@@ -884,7 +882,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Network properties of a server"
+          "description": "Network properties of a server."
         },
         "pointInTimeUTC": {
           "type": "string",
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 806a090305..c5ec915e83 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -9385,24 +9385,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2022-05-01-preview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers_migrations"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/serverGroupsv2"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/serverGroupsv2_coordinatorConfigurations"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/serverGroupsv2_firewallRules"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/serverGroupsv2_nodeConfigurations"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/serverGroupsv2_privateEndpointConnections"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2022-11-08/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/serverGroupsv2_roles"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2022-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers"
         },