Adding explicit containment and using certname for environment