FC Bayern have extended the contract of goalkeeper Manuel Neuer until 30 June 2024.