Improve deploy and restart