SOLEIL, the French 2.75 GeV synchrotron light source is delivering photons to 24 beamlines and is presently equipped with 24 insertion devices (ID) including a high field and small gap in-vacuum wiggler [1]. This paper presents the continuous work performed to reduce the strong non-linear effects of several IDs. On one side, the ID defaults have been accurately identified using on-beam measurements, and magnetic correction developments are going on and on the other side, a new optics has been optimised in terms of beta-functions (at the ID location) and non-linear dynamics in order to improve the injection efficiency and the beam lifetime in the presence of IDs. In parallel, an extensive experimental optimization has been performed to prepare the operation with an additional quadrupole triplet that provides double low vertical beta functions in one long straight section that will accommodate two canted in-vacuum undulators [2]. The paper presents also the dedicated "low-" optics that has been optimised for short bunch production.