Switching to s3 storage