Merge "Bug fix on env file naming"