diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go
index d4c4f6d8a9c7..bcb928145eea 100644
--- a/azurerm/resource_arm_postgresql_server.go
+++ b/azurerm/resource_arm_postgresql_server.go
@@ -60,10 +60,12 @@ func resourceArmPostgreSQLServer() *schema.Resource {
 								"GP_Gen5_8",
 								"GP_Gen5_16",
 								"GP_Gen5_32",
+								"GP_Gen5_64",
 								"MO_Gen5_2",
 								"MO_Gen5_4",
 								"MO_Gen5_8",
 								"MO_Gen5_16",
+								"MO_Gen5_32",
 							}, true),
 							DiffSuppressFunc: suppress.CaseDifference,
 						},
@@ -78,6 +80,7 @@ func resourceArmPostgreSQLServer() *schema.Resource {
 								8,
 								16,
 								32,
+								64,
 							}),
 						},
 
@@ -232,8 +235,7 @@ func resourceArmPostgreSQLServerCreate(d *schema.ResourceData, meta interface{})
 		return fmt.Errorf("Error creating PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
-	err = future.WaitForCompletionRef(ctx, client.Client)
-	if err != nil {
+	if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
 		return fmt.Errorf("Error waiting for creation of PostgreSQL Server %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}