Refactor to make use of the upstream container changes.

- This does not yet include the LDAP auth.