The murder of Gianni Versace will be chronicled in FX's American Crime Story sooner than scheduled. The Assassination of Gianni Versace: American Crime Story was originally slated as the third season of Ryan Murphy's anthology series – following a second season focused on the aftermath of Hurricane Katrina – but will now air as season two, per Variety.

While production on Versace has been underway for several weeks, with Murphy sharing a first look from the set last month, Katrina is still currently in pre-production. The shakeup means that season two will hew much closer to the show's true-crime roots, and given how acclaimed its first season The People v OJ Simpson was, that may be a smart move.

Adapted from the true crime book Vulgar Favors by Maureen Orth, the series will chronicle the 1997 murder of Versace. Cunanan shot Versace dead on the steps of his Miami Beach home after committing several other murders. He committed suicide eight days later. Edgar Ramirez will play Versace, Penelope Cruz will play his sister Donatella Versace, and Ricky Martin plays his longtime partner Antonio D'Amico. New Girl's Max Greenfield has also been cast in an unknown role.

The Assassination of Gianni Versace: American Crime Story will premiere in early 2018, with Katrina: American Crime Story following later in the year.