change: Template adjustements for deploy