Update more vars that need to use $ instead of jinja.