Some templating and migration fix

1 job for master in 1 minute and 48 seconds