Update to api version 1.8 and add container names