My water pressure is normal, around 60 psi when nothing is running, when the 22 year old gas hot water heater cycles on, the pressure will steadily climb to around 150 psi and the temp/pres relief valve starts to bleed off pressure in the form of water draining from the ptrv. Will installing and expansion tank improve this condition or could I have excessive calcium build up in the water heater causing an overheating condition? I'm having a plumber come out tomorrow to install an expansion tank, which I understand has to be done, none the less to bring the system up to current building code.