Lingering rumors of a falling out between former Broncos head coach Gary Kubiak and general manager John Elway can now be set aside for good.

Kubiak will rejoin the Broncos as a scouting adviser, according to 9News’ Mike Klis. He will be based in Texas, occasionally traveling to Denver to attend meetings. Kubiak should work closely with his son, Klein, one of the Broncos’ southwest area scouts.

This will be Kubiak’s fourth stint in Denver. Most recently, the Texas A&M alum joined the Broncos as the team’s head coach, following the dismissal of John Fox in early 2015. In his first year as the Broncos’ head coach, Kubiak led the team to a Super Bowl title. He left following last season, due to health issues.

The Broncos drafted Kubiak, a quarterback, in the eighth round of the 1983 NFL Draft. He spent nine seasons backing up John Elway in Denver, posting a 3-2 record as a starter.

After retiring as a player, Kubiak began coaching. He spent 1994 with the 49ers as a quarterbacks coach, helping Steve Young to an MVP award and Super Bowl title. Kubiak then left for Denver where he was the offensive coordinator and quarterbacks coach under Mike Shanahan from 1995-2005. He won two Super Bowls during that stint.

Kubiak received his first head coaching job from the Texans in 2006. A Houston native, Kubiak spent eight seasons in his hometown before being fired amidst a 2-14 season. He served the next season as on offensive coordinator for the Ravens before becoming the Broncos’ head coach.