*8221* Fix missing template setup