Bring gateways back in house