Add epic waits because of slow EDGE