Re-working the deploy scripts