diff --git a/app/src/main/res/raw/assistant_create.rc b/app/src/main/res/raw/assistant_create.rc
index 2627f3b5b..2fa47358c 100644
--- a/app/src/main/res/raw/assistant_create.rc
+++ b/app/src/main/res/raw/assistant_create.rc
@@ -9,8 +9,8 @@
     <entry name="quality_reporting_interval" overwrite="true">180</entry>
     <entry name="reg_expires" overwrite="true">31536000</entry>
     <entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
-    <entry name="reg_proxy" overwrite="true">&lt;sip:sip-staging.linphone.org:5081;transport=tls&gt;</entry>
-    <entry name="reg_route" overwrite="true">&lt;sip:sip-staging.linphone.org:5081;transport=tls&gt;</entry>
+    <entry name="reg_proxy" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
+    <entry name="reg_route" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
     <entry name="reg_sendregister" overwrite="true">1</entry>
     <entry name="nat_policy_ref" overwrite="true">nat_policy_default_values</entry>
     <entry name="realm" overwrite="true">sip.linphone.org</entry>
diff --git a/app/src/main/res/raw/linphonerc_factory b/app/src/main/res/raw/linphonerc_factory
index d9361b4fa..7040801dc 100644
--- a/app/src/main/res/raw/linphonerc_factory
+++ b/app/src/main/res/raw/linphonerc_factory
@@ -67,7 +67,7 @@ xmlrpc_url=https://subscribe.linphone.org:444/wizard.php
 
 [lime]
 lime_v2=1
-x3dh_server_url=http://54.37.202.229:8082/flexisip-account-manager/x3dh-25519.php
+x3dh_server_url=http://sip-staging.linphone.org:8083/flexisip-account-manager/x3dh-25519.php
 lime_update_threshold=86400
 max_nb_device_per_participant=255
 allow_message_in_unsafe_chatroom=1
diff --git a/build.gradle b/build.gradle
index 5d0774730..208e5988a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "com.diffplug.spotless:spotless-plugin-gradle:3.16.0"