McLaren has extended the contracts of CEO Zak Brown, team principal Andreas Seidl and "the entire leadership team", which are seen as going "hand in hand" with the new agreement handed to Lando Norris.
But McLaren has also gone a step further by ensuring Brown, Seidl and the likes of executive technical director James Key and executive racing director Andrea Stella also remain with the team for the long term.
Speaking in a media briefing, including GPFans, Seidl said: "Key for us here, after creating stability over the last couple of years within the team, is not just continuity and consistency on the driver line-up side but throughout the entire team.
"So I'm very happy to announce that the long-term signing of Lando goes hand in hand with long-term commitments from Zak's side, from my side and my entire leadership team.
"This is a great sign of belief from everyone that is involved in the journey, the entire team, that we have everything in place, or everything is coming into place over the next couple of years which we need to get this team back to the front in Formula 1."