Fix CR templates generation after salt update