The Chiefs have announced interim head coach Clayton McMillan has signed on as an assistant coach for 2022 and 2023.
Bay of Plenty's McMillan was appointed interim head coach for this year's Super Rugby campaign while Warren Gatland leads the British and Irish Lions tour of South Africa.
McMillan said he was grateful for the opportunity to continue his coaching journey with the Chiefs.
"I am stoked to have signed on for another couple of years post-2021 and I am incredibly grateful for the opportunity," he said.
"The club has shown faith in my ability by extending my contract at this early stage, which demonstrates an organisation with a clear vision for its future and I am excited to be a part of that."
McMillan is excited by the prospect of being mentored by Gatland.
"I have already formed a good relationship with Gats. He was extremely welcoming in 2020 and allowed me to come in and see the organisation from the top down. We have caught up numerous times since and we will continue to build on our relationship.
"Personally, a significant attraction for me coming to the Chiefs was to have the opportunity to work alongside Gats. He is one of the world's most successful coaches.
"I have always been a head coach, so in many respects I will relish the opportunity to step back and be mentored by somebody of his experience and stature.
"It is only going to help me in my coaching journey and one I am exceptionally grateful for," McMillan said.
Chiefs Rugby Club chief executive Michael Collins said it was great to have McMillan signed with the club for a further two years.
"We are thrilled he is committed to staying on with the Gallagher Chiefs for the 2022 and 2023 seasons as an assistant coach.
"Clayton has a great record of results from coaching the Bay of Plenty Steamers and the Māori All Blacks. He is a proven leader who understands our Chiefs culture.
"Clayton and Gatty have formed a good working relationship and this combination is going to be fundamentally important for the growth and development of our club," Collins said.
"Clayton has already had a positive impact since he joined us and we are excited to see him lead the Gallagher Chiefs this coming Sky Super Rugby season."
Gatland said he was pleased to have McMillan continue in the coaching group.
"I'm absolutely delighted that Clayton has been appointed in a long-term role with the Gallagher Chiefs," he said.
"He is extremely well respected in the game and what he has achieved with Bay of Plenty and the Māori All Blacks gives him the credit he deserves coming into these roles as head coach for this season and continuing as assistant coach when I return."