Issue with advancement

I wanted to make sure that when we used a bottle of water specifically and not just a potion, it activated something. For this I tried with the use:potion scoreboard objectives but that does not take into account a type of potion in this case water. I was then told to do with the advancement but the problem is that the using_item trigger with a bottle of water as the selected item is activated when I right-click with this item and not when I drink it. Do you have a solution to my problem?