Fixing environment variables issue for build