My baby was the same way, i’d offer water and he started to not want it he still wakes up, but it’s just to be up now
maybe change your routine a little like adding stories or a song before bed,, my son has been in his own crib for a while but i started off rocking and being with him until he was asleep like out lol eventually i started just putting him in his crib and just being in the rocking chair hanging out until he was asleep we tried the whine it out method and that worked for us but it gets annoying lol our ped recommended no liquids before bed so he wouldnt wake up from a full diaper in the middle of the night but when he does wake up i just let him play in his playroom and practice using his body or whatever he wants to do
He could be using it for comfort. Try offering water instead cuz he could also just be thirsty my son wakes up super super thirsty at night. It might be rough and he might cry a little bit for the first week maybe. Also make sure you check that he hasn't pooped and that he's not too hot too cold or in pain from teething 🙂
At this age he should be getting plenty of calories during the day and doesn't need them overnight. I would try giving him a bottle with water and then dealing with the fallout. Just remember: someone has to lose this battle and it can't be you!