diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9e343927dd..62352e3cdb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -246,7 +246,7 @@ iOS and Android apps are locked to the production servers. To test all scenarios
 staging, your best bet is to pull down the development version of the iOS or Android app,
 and register it with one of your extra phone numbers:
 
-First, build Signal for Android or iOS from source, and point its service URL to `textsecure-service-staging.whispersystems.org`:
+First, build Signal for Android or iOS from source, and point its service URL to `chat.staging.signal.org`:
 
 **on Android:** Replace the `SIGNAL_URL` value in [build.gradle](https://github.com/signalapp/Signal-Android/blob/master/build.gradle)
 
diff --git a/config/default.json b/config/default.json
index d87e2e7bab..39fa3ecd2f 100644
--- a/config/default.json
+++ b/config/default.json
@@ -1,5 +1,5 @@
 {
-  "serverUrl": "https://textsecure-service-staging.whispersystems.org",
+  "serverUrl": "https://chat.staging.signal.org",
   "storageUrl": "https://storage-staging.signal.org",
   "directoryUrl": "https://api-staging.directory.signal.org",
   "directoryEnclaveId": "c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15",
diff --git a/config/production.json b/config/production.json
index eb0d37a035..d1f16aae57 100644
--- a/config/production.json
+++ b/config/production.json
@@ -1,5 +1,5 @@
 {
-  "serverUrl": "https://textsecure-service.whispersystems.org",
+  "serverUrl": "https://chat.signal.org",
   "storageUrl": "https://storage.signal.org",
   "directoryUrl": "https://api.directory.signal.org",
   "cdn": {