Improved version using clean environment + container environment