For my gas equipment, I bought 4 of the VIP Racing gasoline jugs that are 3 gal size because as I get older, 5 gal will get harder to handle. They probably make them for diesel, too.
As for the sturdy steel fuel tanks, I have bought two 5 gal ones at estate sales. But I really like the 3 gal...