Update/Refactor  deployment scripts