Let it never be said that American Crime Story boss Ryan Murphy lacks for imaginative casting. Heading into the third, Versace year of the FX Emmy-winner, singer Ricky Martin signs on as Gianni Versace’s longtime partner.

Per FX’s official confirmation, the “Livin’ La Vida Loca” singer and former Glee guest star will play Antonio D’Amico for Versace: American Crime Story, set to air within six months of Katrina’s debut in 2018. D’Amico and Versace met in 1982, while personal and financial relationships with the extended Versace family became strained after Gianni’s murder.

So far, the FX drama’s third year has confirmed Point Break star Edgar Ramirez as Gianni Versace himself, with Glee and Flash star Darren Criss as his killer, Andrew Cunanan, and Penelope Cruz as Donatella Versace. Season 3 will follow the July 1997 murder, which – historical spoiler alert – ended with Cunanan’s suicide suicide eight days later, as police closed in.

Its first two episodes written by Tom Rob Smith, the season will draw from Vanity Fair writer Maureen Orth’s book Vulgar Favors. Seasons 2 and 3 will shoot concurrently, with the third season airing within six months of Katrina, and the Monica Lewinsky story arriving sometime after that.

There are still plenty of roles left to fill, but what do we make of the Versace: American Crime Story cast so far?

More From