If you are talking about the old 1970's Jerrycan set (German and US jerrycans, drums and buckets), yes, it IS horrible.
There is a later German Fuel drum set (#35186) which is much nicer and contains fuel and water jerrycans (with minute inscriptions on the cans), with separate caps and three-bar handles, fuel drums and hand pumps.
EDIT: Likewise, there is an updated "Allied Vehicles Accessory set" (#35229) which contains new tool US Jerrycans (with separate caps and handles), fuel drums, packs and other bits n pieces.