Apple Watch 9 - WatchOS 10.4 Battery Drain

Since updating my Apple Watch 9 with WatchOS 10.4 the battery has been awful. Before the update I was getting 2 full days of battery even with gym workouts on both days, now I'm having to charge my watch every night. It's like being back to having an Apple Watch 3. Are there plans to get this sorted? clearly something in the software is taking a lot more power.