After they changed up the spouts i went to all of garage sales/auctions i could get to just to look for old gas cans.

I have several 5 gallon cans as well as some 2 gallon set back.
I have bought 2 5 gallon water jugs and wrote on the side with a sharpie"not water"in large letters.
If someone drinks out of them it's on them.