The Italian will see out the 2021 season alongside Valentino Rossi, and will also ride for Yamaha's Independent Team in 2022