Move to a new way of overriding the server url that also works for templates