Update with new HEAT template

and updated eth2 config