Better handling of services in deploy.sh