specify return codes, disable timeout for upgrades