I find the military surplus cans from someone like Cheaper Than Dirt work well for fuel storage. I use to use the old style Rubbermaid cans that I really liked a lot but thanks to the California Environmentalist Mafia they are no longer available.
Use the German style cans they are the best I have found. CTD is out of the German made Swiss ones right now (marked Euro Surplus) but they have some new or almost new ones that are almost as good made in Europe for the Israeli army. They are very robust cans that are designed to float even when full and not to gurgle and splash fuel when fuel is poured from them. The pour spout they sell is made in China and is not the same quality as the surplus cans. I just use a funnel which works well with a little practice.
I also have stored fuel in drums but it is more difficult to handle than a 20 liter (5 gallon) can.