Pull in changes from production bootstrap script