Add correct servername to auto-setup