If you're not opposed to a) water and b) filling your own, in my experience there is usually a refill station in the gate area.

I think T4 will not have the same issue with security no longer being at the gate.