More changes on s3 upload for resource images