“Castle” is filling out its eighth season following this week’s renewal.

“State of Affairs” creator Alexi Hawley, who worked as a writer and producer on early seasons of “Castle,” will serve as co-showrunner with Terence Paul Winter, who was announced yesterday, Variety has learned.

The duo will succeed David Amann, who is exiting the crime procedural after serving as showrunner for one season, following his replacement of series creator Andrew Marlowe, who has remained closely attached to the drama as an exec producer.

The news comes just one day after Hawley’s freshman political drama “State of Affairs” was canceled at NBC. The Katherine Heigl-starrer lasted 13 episodes. Hawley’s credits also include “Body of Proof” and the now-late Kevin Bacon thriller “The Following.”

Winter joined “Castle” as a staff writer in 2009 and become a producer in 2011. He wore many hats as supervising producer and co-exec producer and was upped to exec producer this past season.

Season 8 now has a renewal, showrunners and a male lead in Nathan Fillion who firmed up his deal back in April, but Stana Katic is still up in the air, as she hasn’t yet reached an agreement to return.

“Castle” was among 20-plus renewals over at ABC this week.