As a separate question I'm also wondering if we're moving away from hardcoded containers and should just let Wave generate them environment.yml?