[#1930] Refatored deployment scripts