Samoan officials says water-borne diseases are the biggest health worry now that running water has been partly restored in the earthquake-ravaged nation.
The confirmed death toll from last week's tsunami stands at 176, with most of those dead from Samoa, but there are still at least 12 people unaccounted for.
The chief executive of the Ministry of Natural Resources and Environment, Taulealeausumai Laavasa Malua says an undersea pipeline to the island of Manono has now been repaired.
Many villages on the mainland have also had their water restored.
But Mr Malua says that water's not up to drinking standard, and people don't have clean containers to store it in.
"Now that they've got the water supply back on, people might go back and start drinking that water, which we are advising them not to. Also we have to provide clean water containers, because they will just use any container and that will be a threat to the quality of that water."
Mr Malua also says there will be support for those people who want to rebuild their homes away from the coast.
The chief executive says the tsunami devastated villages which had previously been identified as being at risk from flooding.
He says those who've lost their homes aren't interested in rebuilding along the coast at the moment, but it will be a challenge to convince them in the longer term to settle inland.
We've always been working with the villagers, telling them they are in a risk area, and when they rebuild they should probably think about rebuilding permanently inland. But people's linkages to their land and also their heritage, is not easy to be just abandoned like that.
Distributing drinking water remains a priority, and the New Zealand Defence Force's helicopters have been delivering aid to hard to reach areas.