Improve config.yml
Use smarter templating