Improve deploy task