(v1.3.1.2) Cleaned up config.yml improvements