The main drawbacks faced by researchers to successfully implement organic-PCM as materials to improve the thermal performance of building systems are their low thermal conductivity, their high flammability, and their low thermal cycling stability. T In the present work, authors present a new enhanced PCM formulations aimed to solve the stated disadvantages in organic bulk-PCM. The new enhanced PCM were prepared by adding high thermal conductivity particles and two kinds of flame retardants into organic PCM (paraffin and fatty acid eutectic mixtures). In the first stage, the effective thermal conductivity of organic-PCM was increased by using two different methods: directly dispersion of powder graphite (PG) bulk-PCM and vacuum impregnation of PCM into expanded graphite (EG). In the second stage, the fire reaction behaviour of the thermal conductivity enhanced PCM formulations was improved by adding two kind of flame retardant: magnesium hydroxide and ammonium phosphate (APP).. Their fire reaction behaviour, thermal conductivity and thermophysical properties were measured by adapting the dripping test (UNE 23727-90), the hot-wire method and Differential Scanning Calorimetry (DSC), respectively. The enhanced PCM composites show a self-extinguished behaviour in terms of fire performance mechanism. The EG working with endothermic and phosphates flame retardants improve the fire performance of PCM by acting as a synergic system and the thermal conductivity is increased. However, their thermal storage capacity is significant decreased due to the large amount of flame retardant added (up to 40%). The thermal reliability was also tested, the enhanced PCM composites were stable up to 1000 thermal cycles.