Add option not to upload even if S3 is configured
Add option not to archive