Solar water heater rollout programme gains momentum