argh! yeah I can see why you wanna do this.... I will open an issue for master to remove the gateways rightaway so we can at least move master to atomic update!