CI using service name, not just machine name