Charlie Horse

Any one else dealing with these? I never got them with my first pregnancy, but this one, starting at 15w, I get them at least once a week (in the middle of the night 😑) but now they're starting to increase. This morning I woke up at 1 and 4 in severe pain. I drink 64-80oz of water a day. I work out 2-3 times a week and every pilates class we spend a good amount of time of calf stretches. What else can I do?? I'm at a loss because it sucks waking up in pain