Support 3-tier deployments WIP