Use correct config everywhere