Could be just the filter/aerators in the faucets.
But yes the heater. That can be given the vinegar treatment by disconnecting the flexibles and raising them above the heater.
???? But Scots are canny people. They will not do anything that effects their bottom line. I think they are mature enough not to indulge in US style idealism.