Add retry to accomodate slow VM environments