[master] Improve config