Fine-tuning the jinja-templates for the oly template structure