You may need to change the anode rod in your heater. There are two different ones made, one for municipal water and one for well water. Not sure if this will help but it won't hurt and most likely...