Better to have Diesel vehicles and store diesel.
Yes diesel in not volatile and has much longer shelf life.
Good to use biocide in it if you plan on storing > 1 year.