diff --git a/.github/workflows/build-on-pull.yml b/.github/workflows/build-on-pull.yml
index 6e41fea8..ad252a1b 100644
--- a/.github/workflows/build-on-pull.yml
+++ b/.github/workflows/build-on-pull.yml
@@ -40,5 +40,5 @@ jobs:
     - name: Upload App
       uses: actions/upload-artifact@v4
       with:
-        name: apk
+        name: apk-debug
         path: presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk
diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
index fcc93e6a..66b2851d 100644
--- a/domain/src/main/AndroidManifest.xml
+++ b/domain/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
     <application>
         <provider
             android:name="com.moez.QKSMS.contentproviders.MmsPartProvider"
-            android:authorities="dev.octoshrimpy.quik.mmspart"
+            android:authorities="${applicationId}.mmspart"
             android:enabled="true"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 5b84fe5d..33e7d25f 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -71,6 +71,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
+        debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+            resValue("string", "app_name", "QUIK-Debug")
+        }
     }
 
     compileOptions {
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 5caa853a..e0b5e198 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -155,10 +155,10 @@
         <receiver android:name=".receiver.SmsDeliveredReceiver" />
         <receiver
             android:name=".receiver.MmsSentReceiver"
-            android:taskAffinity="dev.octoshrimpy.quik.MMS_SENT" />
+            android:taskAffinity="${applicationId}.MMS_SENT" />
         <receiver
             android:name=".receiver.MmsUpdatedReceiver"
-            android:taskAffinity="dev.octoshrimpy.quik.MMS_UPDATED" />
+            android:taskAffinity="${applicationId}.MMS_UPDATED" />
         <receiver
             android:name=".receiver.MmsReceivedReceiver"
             android:taskAffinity="com.klinker.android.messaging.MMS_RECEIVED" />
@@ -170,7 +170,7 @@
             android:name=".receiver.SpeakThreadsReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="dev.octoshrimpy.quik.intent.action.ACTION_SPEAK_MESSAGES" />
+                <action android:name="${applicationId}.intent.action.ACTION_SPEAK_MESSAGES" />
             </intent-filter>
         </receiver>
         <receiver android:name=".receiver.RemoteMessagingReceiver" />
@@ -190,7 +190,7 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="dev.octoshrimpy.quik.intent.action.ACTION_NOTIFY_DATASET_CHANGED" />
+                <action android:name="${applicationId}.intent.action.ACTION_NOTIFY_DATASET_CHANGED" />
             </intent-filter>
 
             <meta-data
@@ -249,7 +249,7 @@
         <!-- remove default workmanager init so custom injection capable instance can be used -->
         <provider
             android:name="androidx.startup.InitializationProvider"
-            android:authorities="dev.octoshrimpy.quik.androidx-startup"
+            android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
             tools:node="merge">
             <meta-data