Stana Katic has signed on to return to "Castle" for an eighth season as Det. Kate Beckett starting next fall.

Deadline reports Katic joins co-star Nate Fillion, who stars as Castle, in recently inking new deals to return to the show. Both actors' contracts expired at the end of the most recent season. All year long, it's been a guessing game as to what would come of the co-stars and the show itself, as network executives only recently green-lit the series for another season.

Deadline also speculates news of the two stars resigning "ensures a proper resolution to the cliffhanger in last night's Season 7 finale where Beckett was left pondering an offer to run for the New York State Senate."

TV Line recently reported series alum Alexi Hawley will also be returning to the show next season as co-showrunner, replacing the outgoing David Amann. Hawley, who previously worked as a producer on seasons 2-4, will be joined in the showrunner's role by former series writer Terence Paul Winter.

In his former role, Winter wrote nine episodes, including "Kill Shot," "To Love and Die in LA" and "Headhunters," which guest starred Adam Baldwin. His producing credits also include "Body of Proof" and "State of Affairs," which he also created.

More than anyone, Katic's fate has long been a mystery. Early in the season, she told TVLine she was prepared for whatever might come next for her character.

"If the character is complete, if there is nowhere else to go creatively, then I think it's better to stop when you're on top," she said.

"For me it's about art over finance, and as long as we're creating something that is compelling and that has somewhere to go, then we're good to go. And when we find that we're not... then it's time for everyone to pack up and move onto the next thing."