Moved S3 config to occur after startup