Check and replace the anode rod in your water heater. It’ll vastly extend the life of the unit, and will improve the quality of your water. If you have tankless, then be sure to descale it.