diff --git a/app/build.gradle b/app/build.gradle
index f32c908a2..ac735ebbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,7 +131,7 @@ android {
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
-        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
+        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
         buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
         buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
@@ -328,7 +328,7 @@ android {
 
             applicationIdSuffix ".staging"
 
-            buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
+            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
diff --git a/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java b/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java
index c20dd8e43..dfac652b4 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java
@@ -91,8 +91,8 @@ public final class ScrubberTest {
       "***.com:443"
     },
 
-    { "Failed to resolve textsecure-service.whispersystems.org using . Continuing.",
-      "Failed to resolve textsecure-service.whispersystems.org using . Continuing."
+    { "Failed to resolve chat.signal.org using . Continuing.",
+      "Failed to resolve chat.signal.org using . Continuing."
     },
 
     { " Caused by: java.io.IOException: unexpected end of stream on Connection{storage.signal.org:443, proxy=DIRECT hostAddress=storage.signal.org/142.251.32.211:443 cipherSuite=TLS_AES_128_GCM_SHA256 protocol=http/1.1}",