Castle is instigating a little workplace drama for Beckett, casting Kris Polaha as a major foil for the newly-minted NYPD captain.

TVLine has learned exclusively that the Life Unexpected and Ringer vet is joining Season 8 in the recurring role of Caleb Brown, an idealistic public defender whose criminal clients put him at odds with Beckett and the 12th Precinct.

Polaha’s legal agitator arrives at a tumultuous time for Beckett, who is already contending with crises both personal (her split with Rick) and professional (her deadly search for Bracken’s partner). Regarding the former hullabaloo, co-showrunner Terence Paul Winter recently assured fans (via TVLine’s Matt Mitovich) that there is a method to the breakup madness.

“We have a real plan for how to guide through this new path, and we really do believe it’s going to be something that will be satisfying overall,” he said. “If people give us a chance, they’re going to really — hopefully — appreciate the journey we’re going on.”

Polaha’s recent TV credits include a series-regular stint on Fox’s Backstrom and an arc on CBS’ Stalker. Look for his Castle alter ego to debut later this fall.