volumes: cleaning up retry logic