Updates to script and puppet provisioning process