Did you know that herbal tea (which is naturally caffeine free) contributes to your water intake? Have as much of this as you like and you’ll get the awesome benefits of whichever tea you’re consuming too! Please note that black, green and white tea don’t count as herbal tea as they all contain caffeine.
Another option would be to infuse your water with fruits/veg/herbs to make it more interesting. You can use plain or sparkling water and add things like orange, lemon, lime, blueberries, mint, cucumber and so on.