Improve signal handling for service and containers