Fix the templating in order to use version