I believe Robin was asking me about my fuel and water cans on the AZ run, but I figured I'd post up here.

You can get new NATO style cans (they even have a CARB legal one) produced by Wedco here:
https://www.expeditionexchange.com/wedco/

I bought my water can from them new about a year ago. I dumped it before the AZ run to refill it with fresh water, however the water in it was still clear and drinkable, no odor, taste or color even though it had been in there for at least 4 months.

X2 on the water can.

The Wedco cans have served me well for several years. Water can still good (has a food-grade liner) and the fuel cans don't leak. I mean, don't. On a trip from DV (lowest point at Badwater at 262 below sea level) to CO (crossing a pass at 12,000) they remain all good. Nice thing, you can invert them when filling to drain them completely.

Skip the CARB ones, get the regular ones if possible. They seal better, but not legal in some states.

The guys at EE are good to deal with as well. I know them and swing by there on a semi-regular basis. They actually have fair prices on a bunch of stuff, Hella lights and recovery gear and what-not, though they do go for the more shi-shi Rover crowd. They have a deal on the cans if you buy four.

By the way, for the Cali people, if you get non-CA legal cans somewhere, the water can spouts are identical, but blue.

Thanks for the link, I like all of the products.