Another small step in my attempts to increase my fluid intake/water intake was to swap caffeinated tea and coffee for decaf or herb tea, mint tea for me. Now I only drink caffeinated beverage once a day in the morning and not the rest of the day.
I have increased my fluid intake and I sleep better by not having the caffeine in my system.
If you have trouble sleeping then this small step might work for you too.
Believe you can and you're halfway there