Update URLs / names and adding env list