diff --git a/.builds/debian-stable.yml b/.builds/debian-stable.yml
index 4ca59820206a0a436949bd9b7b41118b2bdfc3df..1abdf309dda2ff74d398f02048f8bc53cc3d147b 100644
--- a/.builds/debian-stable.yml
+++ b/.builds/debian-stable.yml
@@ -11,7 +11,7 @@ packages:
 - android-sdk
 secrets:
 - 7eed327c-05c7-49b4-baed-a4d8785588d5
-- 9c6cc176-db6c-4158-9abb-2cb1662d5ca9
+- b412b263-bdde-410b-997e-6326aba90132
 - 6b782fde-a43b-4988-b102-38fa541bb788
 environment:
   ANDROID_SDK_ROOT: /home/build/android
diff --git a/build.gradle b/build.gradle
index 700adca0c15546fda104d2786627cacbdf64af96..d165d6fd3a440c33f357f376fcaafb85b96dfa99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,6 +174,7 @@ android {
         playstore {
             dimension "distribution"
             versionNameSuffix "+playstore"
+            applicationIdSuffix "playstore"
         }
         free {
             dimension "distribution"
@@ -220,6 +221,7 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk.debugSymbolLevel = 'full'
         }
         debug {
             shrinkResources true
diff --git a/src/conversationsPlaystore/res/values/strings.xml b/src/conversationsPlaystore/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a6cbc9807a4d0870ffc537d0819dc3f463474db4
--- /dev/null
+++ b/src/conversationsPlaystore/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="applicationId">com.cheogram.android.playstore</string>
+</resources>
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index e12233e107b749f06f3d6bd75edaaa2484f1b31c..8971ab50f8e245919e429bf53191fadbe8999dda 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
+import eu.siacs.conversations.BuildConfig;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.android.AbstractPhoneContact;
@@ -641,7 +642,7 @@ public class Contact implements ListItem, Blockable {
 
     public PhoneAccountHandle phoneAccountHandle() {
         ComponentName componentName = new ComponentName(
-            "com.cheogram.android",
+            BuildConfig.APPLICATION_ID,
             "com.cheogram.android.ConnectionService"
         );
         return new PhoneAccountHandle(componentName, phoneAccountLabel());