Fix configuration to prevent double entries
Fix after upgrading dependencies