Add retry option in case of latency issues

Retry the step X times when fails