I cannot recommend highly enough having a set of glass bottles[1] at home. Fill them at the tap (or wherever), refrigerate them, take them to the gym, in the car, serve to guests. Point is to have many, keep a rotation going. Has greatly reduced reliance on plastic.