diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 4298547d..7762a4cb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -32,7 +32,7 @@ class LiveConfig {
             "fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe");
     private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87";
 
-    private final static String URL = "https://textsecure-service.whispersystems.org";
+    private final static String URL = "https://chat.signal.org";
     private final static String CDN_URL = "https://cdn.signal.org";
     private final static String CDN2_URL = "https://cdn2.signal.org";
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org";
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
index 9ca9dc8b..12d87cf5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
@@ -32,7 +32,7 @@ class SandboxConfig {
             "51a56084c0b21c6b8f62b1bc792ec9bedac4c7c3964bb08ddcab868158c09982");
     private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87";
 
-    private final static String URL = "https://textsecure-service-staging.whispersystems.org";
+    private final static String URL = "https://chat.staging.signal.org";
     private final static String CDN_URL = "https://cdn-staging.signal.org";
     private final static String CDN2_URL = "https://cdn2-staging.signal.org";
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";