British rider Danny Kent will stay with Leopard Racing in Moto2 in 2017, but switch to ride the returning Suter chassis.
Kent won the Moto3 title with the team in 2015, and followed it back up to Moto2 this year. He sits 21st in the standings after 14 rounds.
He will contest a second season in Moto2 next year with the Kiefer Racing-run outfit as it switches from the Kalex chassis to Suter, joined by Swiss rider Dominique Aegerter, currently 11th in the points.
Suter won Moto2 constructors' titles in 2010, '11 and '12, but has largely disappeared from the grid this season, with its best result recorded by wildcard Anthony West with 10th in the wet Brno race.
It will return with a factory presence in 2017, with Dynavolt Intact also electing to switch to Suter's MMX2 from Kalex.
"I am very happy with the partnership with Suter that will begin with the season 2017," Leopard Racing's Miodrag Kotur said.
"We have confidence in the know-how and the desire Suter have to be competitive when they return with our riders and our structure.
"Leopard Racing wants to engage deeply in the world championship and take the necessary steps to fight with the best for the title.
"Team manger Stefan Kiefer is already working to strengthen the team with senior technicians."
Kent's current team-mate Miguel Oliveira is moving to KTM's new Moto2 programme.