Update to use the new Self Contained Agent

They’ll be useless once the self contained agent is released