FLOE-125: Using distribute options for templates

Switched back to using distribute options for the templates.