The more water you drink, the less you will retain, actually. When you get dehydrated, your body tries to hold on to as much water as it can (so it does not die). So, drink as much as you can and the body will expect that it will always have it available, and get rid of the stores (bloating, puffiness).