My passport was due to expire in April 2016.
When I went back to my home country in the summer, I renewed my passport which now expires on 2025.

I re-entered with my new passport.
Why not do the same as it may cost more if you renew later from qatar rather than your home country