The Mexico City Grand Prix will remain on the F1 calendar until 2025, inclusive, following an agreement between F1, the Government of Mexico City and the race promoters.