template use improvement

Signed-off-by: stolati <mickael.kerbrat@gmail.com>