MOSYNC-2562: Fixed environment variables to handle this properly