diff --git a/app/src/main/java/org/dataverse/android/dataverse/MainActivity.java b/app/src/main/java/org/dataverse/android/dataverse/MainActivity.java
index ea4be0a..8336754 100644
--- a/app/src/main/java/org/dataverse/android/dataverse/MainActivity.java
+++ b/app/src/main/java/org/dataverse/android/dataverse/MainActivity.java
@@ -182,7 +182,7 @@ private void setupSearchServer() {
             }
         } else {
             // sane default
-            searchServer = "apitest.dataverse.org";
+            searchServer = "demo.dataverse.org";
         }
     }
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f72f1f1..4c87f03 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2,16 +2,14 @@
 <resources>
 
     <string-array name="server_entries">
-        <item>apitest.dataverse.org</item>
-        <item>dataverse-demo.iq.harvard.edu</item>
-        <item>dvn-build.hmdc.harvard.edu</item>
+        <item>demo.dataverse.org</item>
+        <item>dataverse.harvard.edu</item>
         <item>@string/settings_server_custom</item>
     </string-array>
 
     <string-array name="server_values">
-        <item>apitest.dataverse.org</item>
-        <item>dataverse-demo.iq.harvard.edu</item>
-        <item>dvn-build.hmdc.harvard.edu</item>
+        <item>demo.dataverse.org</item>
+        <item>dataverse.harvard.edu</item>
         <item>custom</item>
     </string-array>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f120724..add7b7c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ListPreference
-        android:defaultValue="apitest.dataverse.org"
+        android:defaultValue="demo.dataverse.org"
         android:entries="@array/server_entries"
         android:entryValues="@array/server_values"
         android:key="pref_server_list"
@@ -10,7 +10,7 @@
         android:title="@string/settings_server_title" />
 
     <EditTextPreference
-        android:defaultValue="apitest.dataverse.org"
+        android:defaultValue="demo.dataverse.org"
         android:key="custom_server"
         android:summary="@string/settings_server_custom_summary"
         android:title="@string/settings_server_custom_title" />