Unfortunately I don't know the dates yet as we are just shifting the location from Jeddah to Dubai due to covid travel restrictions so we might need to shift exact dates as well depending on availabilities.
Everything is changing here all the time, so who knows what it will be like come May.
Stay tuned, and I'm sure you'll find a way to do diving both weekends.