Move uploading to after script