For DD1 here at the same age, it really just came down to us learning the word no.
She had a small cup with some water only in it, and that was it. We had tears and carry on for about a week, then she got the picture and the only time that changes even now, is if it is stinking hot overnight or if she is sick.
I think you just need to put your foot down.