Orlando Magic assistant James Borrego has finalized a coaching deal to rejoin Gregg Popovich and the San Antonio Spurs, league sources told RealGM.

Borrego was an assistant coach under Popovich from 2003 to 2010 before joining Monty Williams with the New Orleans Pelicans and then Jacque Vaughn with the Magic.

Borrego finished this season as the Orlando interim head coach after the firing of Vaughn, and had the option to return to the Magic under Scott Skiles.