Scottish rider Keith Amor is to return to the Superbike and Superstock classes at the North West 200 in May.
Amor, who won the Superstock event in 2010, will ride BMW machinery in both classes as he chases his second NW win.
The 42-year-old made a return to racing last season in the Supertwins and Supersport classes after taking a two-year sabbatical from the sport.
The former Honda factory rider will also have a brace of World Supersport Hondas for the 600cc category.
"I will have six bikes in total, three BMWs and three Hondas," explained Amor, who will receive backing from RigDeluge.
"The plan is to have two stockers, one set up for the dry and the other for the wet, alongside the superbike. I am getting Motorrad support from Germany with engines, electronics and data and we will run Ohlins factory suspension on all the bikes."
With the shoulder injury that sparked his two-year lay off now fully recovered, Amor says he wants to recapture the form he showed in 2010, which brought him international wins at the North West 200 and Ulster Grand Prix.
"I won the Superstock race at the North West in 2010 and that was my best ever season." he recalled.
"I want to go back to what I know and what I ran then." he said.
"I am in a really good position and this is my job for the next two years. I have my brother Guy as my mechanic setting the bikes up for me and I just have to build myself up to race speed."
"There are places at the North West where you have to hold your breath because it is so fast and it is definitely somewhere that favours the brave. I am brave and I have a fast bike so it will suit me."