If you are doing this yourself, when you purchace your new water heater be sure you also get a new pressure temperature relief valve and when you plumb it in do not use regular PVC. Some areas allow the use of CPVC or PEX and others require metal.