Improve deploy setup