Six months after losing his ONE Championship lightweight title, Japanese MMA veteran Shinya Aoki is making a return.

Aoki is heading back to Singapore’s Indoor Stadium for a grappling super-match between former against IBJJF World and Pan American Brazilian jiu-jitsu champion Garry Tonon.

The match-up will take place at ONE: Dynasty of Heroes, a card that will be headlined by women’s atomweight world champion Angela Lee and challenger Istela Nunes.

Aoki (39-7) is one of the most decorated mixed martial artists around the world. He is the DREAM lightweight champion, former Shooto welterweight champion and the former ONE Championship lightweight champion.

The 33-year-old Aoki is a Brazilian jiu-jitsu black belt under Yuki Nakai and has won multiple grappling tournaments across the globe. He also holds a black belt in judo.

Last November Aoki lost his ONE title to Eduard Folayang in a third round TKO, ending one of the promotions longest championship reigns.

Now, he returns to face Garry “The Lion Killer” Tonon, a Brazilian jiu-jitsu black belt under Tom deBlass and Ricardo Almeida.

Tonon is a no gi specialist who has clinched multiple world titles at the IBJJF World and Pan American Championships. He is a prominent fixture in submission-only format competitions such as Metamoris, Polaris and the Eddie Bravo Invitational.

ONE: Dynasty of Heroes will take place on 26 May at the Singapore Indoor Stadium.