Switched from --terminate to --keep-alive option