Adding exlicit containment and using certname for environment