diff --git a/src/azure-cli/azure/cli/command_modules/postgresql/_params.py b/src/azure-cli/azure/cli/command_modules/postgresql/_params.py
index 1ac3157f4f4..865c7ab0958 100644
--- a/src/azure-cli/azure/cli/command_modules/postgresql/_params.py
+++ b/src/azure-cli/azure/cli/command_modules/postgresql/_params.py
@@ -445,6 +445,7 @@ def _flexible_server_params(command_group):
             c.argument('subnet_address_prefix', arg_type=subnet_address_prefix_arg_type)
             c.argument('private_dns_zone_arguments', private_dns_zone_arguments_arg_type)
             c.argument('zone', arg_type=zone_arg_type)
+            c.argument('tags', tags_type)
             c.argument('yes', arg_type=yes_arg_type)
             c.argument('byok_key', arg_type=key_arg_type)
             c.argument('byok_identity', arg_type=identity_arg_type)
@@ -463,6 +464,7 @@ def _flexible_server_params(command_group):
             c.argument('subnet_address_prefix', arg_type=subnet_address_prefix_arg_type)
             c.argument('private_dns_zone_arguments', private_dns_zone_arguments_arg_type)
             c.argument('zone', arg_type=zone_arg_type)
+            c.argument('tags', tags_type)
             c.argument('yes', arg_type=yes_arg_type)
             c.argument('restore_point_in_time', arg_type=restore_point_in_time_arg_type)
             c.argument('geo_redundant_backup', default='Disabled', arg_type=geo_redundant_backup_arg_type)
diff --git a/src/azure-cli/azure/cli/command_modules/postgresql/commands/custom_commands.py b/src/azure-cli/azure/cli/command_modules/postgresql/commands/custom_commands.py
index 7c446a48e3f..1df08bc6423 100644
--- a/src/azure-cli/azure/cli/command_modules/postgresql/commands/custom_commands.py
+++ b/src/azure-cli/azure/cli/command_modules/postgresql/commands/custom_commands.py
@@ -331,7 +331,7 @@ def flexible_server_restore(cmd, client,
                             source_server, restore_point_in_time=None, zone=None, no_wait=False,
                             subnet=None, subnet_address_prefix=None, vnet=None, vnet_address_prefix=None,
                             private_dns_zone_arguments=None, geo_redundant_backup=None,
-                            byok_identity=None, byok_key=None, backup_byok_identity=None, backup_byok_key=None, storage_type=None, yes=False):
+                            byok_identity=None, byok_key=None, backup_byok_identity=None, backup_byok_key=None, storage_type=None, yes=False, tags=None):
 
     server_name = server_name.lower()
 
@@ -378,7 +378,8 @@ def flexible_server_restore(cmd, client,
             source_server_resource_id=source_server_id,  # this should be the source server name, not id
             create_mode="PointInTimeRestore",
             availability_zone=zone,
-            storage=storage
+            storage=storage,
+            tags=tags
         )
 
         if source_server_object.network.public_network_access == 'Disabled' and any((vnet, subnet)):
@@ -693,7 +694,7 @@ def flexible_list_skus(cmd, client, location):
 def flexible_server_georestore(cmd, client, resource_group_name, server_name, source_server, location, zone=None,
                                vnet=None, vnet_address_prefix=None, subnet=None, subnet_address_prefix=None,
                                private_dns_zone_arguments=None, geo_redundant_backup=None, no_wait=False, yes=False,
-                               byok_identity=None, byok_key=None, backup_byok_identity=None, backup_byok_key=None, restore_point_in_time=None):
+                               byok_identity=None, byok_key=None, backup_byok_identity=None, backup_byok_key=None, restore_point_in_time=None, tags=None):
     validate_resource_group(resource_group_name)
 
     server_name = server_name.lower()
@@ -741,7 +742,8 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so
         source_server_resource_id=source_server_id,
         create_mode="GeoRestore",
         availability_zone=zone,
-        storage=storage
+        storage=storage,
+        tags=tags
     )
 
     if source_server_object.network.public_network_access == 'Disabled':