overlay: Move to common config