Add base and build containers