Update to use the new Self Contained Agent

They’ll be useless once the self contained agent is released
If you remove the enclosing `if`, the correct thing would be to unindent this stanza, unless it's still enclosed?