Significant damage had been done to the "top jail" facility, after fires in several places during the protest.
Amnesty also wanted the Corrections Minister, Kelvin Davis, to end what it described as "dehumanising practices" at Waikeria, and to launch an inquiry into the state of the country's prison system.
Relatives of the men protesting have told RNZ the men are trying to raise awareness of conditions they describe as "inhumane", including brown drinking water, lack of toilet paper and clean bedding, and cramped, overheated cells.
But Department of Corrections incident controller Jeanette Burns said the men's actions were violent, and they had caused significant damage to buildings and property, and were making weapons to use against staff.
Attempts to negotiate their surrender had been made, but had not resolved the situation, and water would only be provided to them on their surrender, she said.
However, a former inmate of Waikeria told RNZ he feared that once the current protest was put down, the long-term problems at the jail wouldn't be addressed.
Billy McFarlane now runs the Puwhakamua Programme for high-risk offenders in Rotorua.
He said unrest had been brewing over prison conditions around the country for some while, and something had to give.
But he was worried for the men involved.
"They're all going to get charged, they're probably all going to end up in maximum security, they're probably all not going to get paroled.
"They're going to suffer the wrath of the system and then slowly this whole problem will probably go under the mat again."
McFarlane said he remembers complaining about the same thing himself in the 1980s.
He felt New Zealand prisons don't do enough to rehabilitate prisoners or reintegrate them back into society.
- RNZ