Get it remapped by a company with a Dyno and a good reputation.
I had my B8 done and it transformed the car , more power with a better delivery and better fuel economy. No issues with reliability in the 4 years .
I will be getting my B9 done , when I find time .