Add retry logic to subscribe and to overlay_repo