Merge "Update Heat env file" into amsterdam