BZ#987771 update templates