Moved some step configuration from setup to install scripts