Change service to broker_or_agent