We just booked for May in Orient Village and got a villa with a cistern. All of the places with cisterns advertise that now. There were plenty of options.