Update gateways for return.