The Fosters fans familiar with Riverdale are in for a treat as the latter's Tommy Martinez has been confirmed to be joining the cast of Fosters spinoff Good Trouble. 

Martinez played Malachi, the leader of the Ghoulie gang, last season in Riverdale and according to TVLine, he is joining Good Trouble as a graphic designer who shares the same apartment complex as Callie and Mariana. 

TVLine reports that Martinez is joining the show as a series regular so Riverdale fans will have plenty opprtunities to see him when the show eventually premieres.

We can't help but wonder whether he will be romantically linked to either Callie or Mariana and if so, whether that will cause tension between the two. 

But the spinoff is a real treat for fans of the original Fosters show who were sad to see the hit show wrap up after five seasons with last week's emotional three-part finale.  

There's no word on the exact release date just yet but it is expected to air on Freeform some time in 2019 and it is known that the first season is getting 13 episodes. 

Also added to the roster are Zuri Adele, from Under the Dome, who is joining the show as a former foster child called Malika, and Roger Bart of Revenge and Desperate Housewives who will play Judge Wilson, who Callie works as a clerk for. 

Other stars confirmed to be joining the cast include Sherry Cola,  Roger Bart, Emma Hunton and Ken Kirby. 

According to CarterMatt, it seems like for now at least, Maia Mitchell and Cierra Ramirez are the only two stars of the original Fosters who are coming onboard the spinoff. 

According to TVLine, production on season 1 has already gotten underway in the past few days so watch this space for more teasers and promos from Freeform as the show develops further.