Teddy did this when he was a puppy and, yes, it became a tiresome game very quickly - for me, anyway!
We used a water bottle like this for about six months:
Amazon
This really worked cuz he liked drinking from it, it kept his area dry when we were away and because he could no longer tip water, it broke his habit.
Would recommend you try it if you have somewhere to securely attach it.