Switch back to installing heat from packages, and add fix for template