There is disclosed an aerosol delivery system comprising: an aerosol-generating device (12) comprising:—a device housing having an open-ended heating chamber configured to receive a carrier cartridge (14);—a heater element (24) disposed within the heating chamber (22) and configured to receive at least a first end of a carrier cartridge (14), said heating element operable to heat a carrier substrate of a carrier unit of said carrier cartridge (14) to cause release of an aerosol-forming precursor therefrom to generate an aerosol when gas is passed through the carrier cartridge (14); and—a carrier cartridge comprising a carrier unit (34), said carrier unit comprising a carrier substrate configured to hold an aerosol-forming precursor comprising a nicotine-containing and/or flavoured fluid, gel, wax, or powder. Also disclosed are a carrier cartridge (14), carrier unit (34), methods of man facturing one or more components of said system, and a kit-of-parts for assembling the system.