Way back when I used water bottle the only one that never failed me were those https://www.amazon.com/Super-Pet-Cri...ritter+canteen

They are spring loaded.