An aerosol-generating system is provided, including a heater including at least one heating element; and a capillary body, wherein the capillary body is wound around the heating element, and the heating element and capillary body are intertwined with one another. The aerosol-generating system is advantageous in that the manufacturing process can be a fast and robust. The heater can be formed with high precision and consistency. Further, the heater and wick assembly are mechanically robust, allowing manual or automatic handling without affecting its dimensions. This allows for a consistent quality of production.