Configure via main config.yml
Merge branch 'main-config'