Templates workflow fixed