diff --git a/app/src/main/java/ch/protonmail/android/core/Constants.kt b/app/src/main/java/ch/protonmail/android/core/Constants.kt
index 924caaad7..b025dc9ee 100644
--- a/app/src/main/java/ch/protonmail/android/core/Constants.kt
+++ b/app/src/main/java/ch/protonmail/android/core/Constants.kt
@@ -27,14 +27,13 @@ import ch.protonmail.android.labels.domain.model.LabelId
 object Constants {
 
     // region Urls
-    const val HOST = "protonmail.ch"
-    const val API_HOST = "api.$HOST"
+    const val HOST = "proton.me"
+    const val API_HOST = "mail-api.$HOST"
     const val BASE_URL = "https://$API_HOST"
     const val DUMMY_URL_PREFIX = "http://androidlinksfix.protonmail.com"
     const val HUMAN_VERIFICATION_URL = "https://verify.proton.me"
 
     // Mail domains
-    const val MAIL_DOMAIN_COM = "protonmail.com"
     const val MAIL_DOMAIN_PM_ME = "pm.me"
     //endregion
 
diff --git a/app/src/main/res/values/links.xml b/app/src/main/res/values/links.xml
index e7ef4847e..24075be7a 100644
--- a/app/src/main/res/values/links.xml
+++ b/app/src/main/res/values/links.xml
@@ -18,7 +18,7 @@
   ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 <resources>
-    <string name="support_protonmail" translatable="false">https://protonmail.com/upgrade</string>
-    <string name="eo_info" translatable="false">https://protonmail.com/support/knowledge-base/encrypt-for-outside-users/</string>
-    <string name="limit_reached_learn_more" translatable="false">https://protonmail.com/support/knowledge-base/increase-my-storage-space/</string>
+    <string name="support_protonmail" translatable="false">https://proton.me/mail/pricing</string>
+    <string name="eo_info" translatable="false">https://proton.me/support/password-protected-emails</string>
+    <string name="limit_reached_learn_more" translatable="false">https://proton.me/support/increase-storage-space</string>
 </resources>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 6d321f124..bde5030b7 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -20,12 +20,12 @@
 <network-security-config>
 
     <domain-config>
-        <domain includeSubdomains="true">api.protonmail.ch</domain>
+        <domain includeSubdomains="true">mail-api.proton.me</domain>
 
         <trustkit-config
             disableDefaultReportUri="true"
             enforcePinning="true">
-            <report-uri>https://reports.protonmail.ch/reports/tls</report-uri>
+            <report-uri>https://reports.proton.me/reports/tls</report-uri>
         </trustkit-config>
 
         <!-- Valid pins -->
diff --git a/app/src/uiAutomation/res/xml/network_security_config.xml b/app/src/uiAutomation/res/xml/network_security_config.xml
index 88e0372ba..d2e1e9501 100644
--- a/app/src/uiAutomation/res/xml/network_security_config.xml
+++ b/app/src/uiAutomation/res/xml/network_security_config.xml
@@ -19,12 +19,12 @@
 <network-security-config>
 
     <domain-config>
-        <domain includeSubdomains="true">api.protonmail.ch</domain>
+        <domain includeSubdomains="true">mail-api.proton.me</domain>
 
         <trustkit-config
             disableDefaultReportUri="true"
             enforcePinning="true">
-            <report-uri>https://reports.protonmail.ch/reports/tls</report-uri>
+            <report-uri>https://reports.proton.me/reports/tls</report-uri>
         </trustkit-config>
 
         <!-- Valid pins -->