Oil bottles might not be the best idea -- it's very hard to clean oil completely off of plastic. And if you don't clean *all* the oil out of plastic bottles before putting emergency water in them, the remaining oil will go rancid and make your water taste nasty.