Repair water lines on the water heater expansion tank, and replace copper tee on the water line. Add drain down valve to water heater