Using correct server mapping to match our app.