The project of the New Gourna by Hassan Fathy in Egypt (1946-1952) considered as an outstanding example of sustainable human settlement and appropriate use of technology in architecture and planning, it also inspired a new generation of architects and planners worldwide through an integration of vernacular technology with modern architectural principles. But through decades of lack of maintenance and neglect, the New Gourna faced severe structural problems and demolishes. This paper focused on the series of efforts that had been done to reach the real project of Safeguard Hassan Fathy architectural legacy in New Gourna 2021, with the proposed work plan of conservation and reuse the heritage public buildings of New Gourna, with a comprehensive sustainable solution to the main problem that threatens the project which is the underground water. The study suggested that a maintenance plan must be established for the new system of the underground water, to avoid any leaking or plugging of the connecting pipes that could affect the level of water under the foundations. The restored buildings also must have a regular maintenance plan, and also must be reused and engaged with the community needs to encourage them to safeguard the heritage buildings and stop sabotaging them.