diff --git a/app/build.gradle b/app/build.gradle
index 28e7da7ae6..381772e1b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,6 +88,8 @@ android {
             buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/donate/\""
             buildConfigField "String", "CHANGELOG", "\"https://github.com/M66B/FairEmail/releases/\""
             buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\""
+            buildConfigField "String", "OPENKEYCHAIN_URI", "\"https://f-droid.org/en/packages/org.sufficientlysecure.keychain/\""
+            buildConfigField "String", "APPS_URI", "\"https://github.com/M66B?tab=repositories/\""
         }
         play_beta {
             dimension "all"
@@ -97,6 +99,8 @@ android {
             buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/#pro\""
             buildConfigField "String", "CHANGELOG", "\"\""
             buildConfigField "String", "GITHUB_LATEST_API", "\"\""
+            buildConfigField "String", "OPENKEYCHAIN_URI", "\"https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain\""
+            buildConfigField "String", "APPS_URI", "\"https://play.google.com/store/apps/dev?id=8420080860664580239\""
         }
         play_release {
             dimension "all"
@@ -106,6 +110,8 @@ android {
             buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/#pro\""
             buildConfigField "String", "CHANGELOG", "\"\""
             buildConfigField "String", "GITHUB_LATEST_API", "\"\""
+            buildConfigField "String", "OPENKEYCHAIN_URI", "\"https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain\""
+            buildConfigField "String", "APPS_URI", "\"https://play.google.com/store/apps/dev?id=8420080860664580239\""
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 378de4f981..c5c75fce83 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -830,8 +830,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
     private Intent getIntentOtherApps() {
         Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(Helper.isPlayStoreInstall()
-                ? Helper.PLAY_APPS_URI : Helper.GITHUB_APPS_URI));
+        intent.setData(Uri.parse(BuildConfig.APPS_URI));
         return intent;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 4f6834ddd5..1adac0e9af 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -132,9 +132,6 @@ public class Helper {
     static final String FAQ_URI = "https://github.com/M66B/FairEmail/blob/master/FAQ.md";
     static final String XDA_URI = "https://forum.xda-developers.com/showthread.php?t=3824168";
     static final String SUPPORT_URI = "https://contact.faircode.eu/?product=fairemailsupport";
-    static final String PGP_URI = "https://f-droid.org/en/packages/org.sufficientlysecure.keychain/";
-    static final String PLAY_APPS_URI = "https://play.google.com/store/apps/dev?id=8420080860664580239";
-    static final String GITHUB_APPS_URI = "https://github.com/M66B?tab=repositories";
     static final String TEST_URI = "https://play.google.com/apps/testing/" + BuildConfig.APPLICATION_ID;
 
     static ExecutorService getBackgroundExecutor(int threads, String name) {
@@ -283,7 +280,7 @@ public class Helper {
 
     static Intent getIntentOpenKeychain() {
         Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(PGP_URI));
+        intent.setData(Uri.parse(BuildConfig.OPENKEYCHAIN_URI));
         return intent;
     }