diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json
index d1a8a6ac4f47..80c13593c935 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json
@@ -61,8 +61,7 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
           "availabilityZone": "1",
           "standbyAvailabilityZone": "2",
@@ -71,7 +70,8 @@
             "startHour": 0,
             "startMinute": 0,
             "customWindow": "Disabled"
-          }
+          },
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
@@ -109,8 +109,7 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
           "availabilityZone": "1",
           "standbyAvailabilityZone": "2",
@@ -119,7 +118,8 @@
             "startHour": 0,
             "startMinute": 0,
             "customWindow": "Disabled"
-          }
+          },
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json
index d3099cf93649..e4acc76d9b4e 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json
@@ -39,10 +39,10 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
-          "availabilityZone": "1"
+          "availabilityZone": "1",
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
@@ -76,10 +76,10 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
-          "availabilityZone": "1"
+          "availabilityZone": "1",
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json
index 49b06b0c9626..6d5cd4c366b8 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json
@@ -24,8 +24,7 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
           "haEnabled": "Enabled",
           "standbyCount": 1,
@@ -37,7 +36,8 @@
             "startHour": 0,
             "startMinute": 0,
             "customWindow": "Disabled"
-          }
+          },
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json
index c66b083767e8..ff984cc1003a 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json
@@ -33,10 +33,10 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
-          "availabilityZone": "1"
+          "availabilityZone": "1",
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json
index 39feb87e4930..221dc006130f 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json
@@ -25,8 +25,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Enabled",
               "standbyCount": 1,
@@ -38,7 +37,8 @@
                 "startHour": 0,
                 "startMinute": 0,
                 "customWindow": "Disabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "tags": {
@@ -65,8 +65,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Disabled",
               "standbyCount": 0,
@@ -77,7 +76,8 @@
                 "startHour": 10,
                 "startMinute": 30,
                 "customWindow": "Enabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "tags": {
@@ -104,8 +104,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Disabled",
               "standbyCount": 0,
@@ -116,7 +115,8 @@
                 "startHour": 0,
                 "startMinute": 0,
                 "customWindow": "Disabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "tags": {
@@ -143,8 +143,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Enabled",
               "standbyCount": 1,
@@ -156,7 +155,8 @@
                 "startHour": 0,
                 "startMinute": 0,
                 "customWindow": "Disabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json
index 1e59f192b218..ae920a479ac3 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json
@@ -26,8 +26,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Enabled",
               "standbyCount": 1,
@@ -39,7 +38,8 @@
                 "startHour": 10,
                 "startMinute": 30,
                 "customWindow": "Enabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1",
@@ -63,8 +63,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Disabled",
               "standbyCount": 0,
@@ -75,7 +74,8 @@
                 "startHour": 0,
                 "startMinute": 0,
                 "customWindow": "Disabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc2",
@@ -99,8 +99,7 @@
               "storageProfile": {
                 "storageMB": 524288,
                 "backupRetentionDays": 7,
-                "geoRedundantBackup": "Disabled",
-                "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+                "geoRedundantBackup": "Disabled"
               },
               "haEnabled": "Disabled",
               "standbyCount": 0,
@@ -111,7 +110,8 @@
                 "startHour": 10,
                 "startMinute": 30,
                 "customWindow": "Enabled"
-              }
+              },
+              "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
             },
             "location": "westus",
             "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json
index ebcb79ed0800..de8d96e7d363 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json
@@ -38,15 +38,15 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 20,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
           "delegatedSubnetArguments": {},
           "privateDnsZoneArguments": {},
           "haEnabled": "Disabled",
           "standbyCount": 0,
           "logBackupStorageSku": "Standard_ZRS",
-          "availabilityZone": "1"
+          "availabilityZone": "1",
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
index 034dbc34e0f7..4f81f84c834c 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
@@ -35,8 +35,7 @@
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 20,
-            "geoRedundantBackup": "Disabled",
-            "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
+            "geoRedundantBackup": "Disabled"
           },
           "delegatedSubnetArguments": {},
           "privateDnsZoneArguments": {},
@@ -49,7 +48,8 @@
             "startHour": 8,
             "startMinute": 0,
             "customWindow": "Enabled"
-          }
+          },
+          "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
         },
         "location": "westus",
         "tags": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json
index 2f9d84b9b974..632069ebe2be 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json
@@ -1343,6 +1343,12 @@
             }
           }
         },
+        "earliestRestoreDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The earliest restore point time (ISO8601 format) for server.",
+          "readOnly": true
+        },
         "createMode": {
           "type": "string",
           "description": "The mode to create a new PostgreSQL server.",
@@ -1527,12 +1533,6 @@
             "create",
             "read"
           ]
-        },
-        "earliestRestoreDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The earliest restore point time (ISO8601 format) for server.",
-          "readOnly": true
         }
       },
       "description": "Storage Profile properties of a server"
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json
index 253af0941bb2..3baa3402d17a 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json
@@ -1525,7 +1525,11 @@
         },
         "maintenanceWindow": {
           "$ref": "#/definitions/MaintenanceWindow",
-          "description": "Maintenance window properties of a server."
+          "description": "Maintenance window properties of a server.",
+          "x-ms-mutability": [
+            "update",
+            "read"
+          ]
         },
         "createMode": {
           "type": "string",
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json
index 03b5b297e044..bb28f42fb9f2 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json
@@ -1525,7 +1525,11 @@
         },
         "maintenanceWindow": {
           "$ref": "#/definitions/MaintenanceWindow",
-          "description": "Maintenance window properties of a server."
+          "description": "Maintenance window properties of a server.",
+          "x-ms-mutability": [
+            "update",
+            "read"
+          ]
         },
         "createMode": {
           "type": "string",