By Matt Webb Mitovich / June 6 2016, 6:14 PM PDT

CBS’ NCIS: Los Angeles will be in new, good hands come Season 8.

Having served as showrunner since siring the NCIS spinoff back in 2009, Shane Brennan (photo, left) is stepping down to focus on developing new projects as part of a two-year extension of his deal with CBS TV Studios.

Among the shows Brennan has been developing is a TV adaptation of the movie franchise The Expendables, currently being shopped around.

Taking over as NCIS: LA showrunner, our sister site Deadline reports, is R. Scott Gemmill, Brennan’s longtime No. 2 and an executive producer since Day 1. He also has written more than 30 of the offshoot’s 160 episodes. Gemmill’s pre-NCIS: LA credits include The Unit, ER and JAG.

NCIS: Los Angeles returns for Season 8 this fall, now airing Sundays at 8/7c, leading into Madam Secretary and then Elementary.

Source: TV Line