diff --git a/android/build.gradle b/android/build.gradle
index f680e515c..246a582ec 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -33,6 +33,7 @@ android {
 		debug {
 			debuggable true
 			jniDebuggable true
+			applicationIdSuffix '.debug'
 		}
 
 		reldebug {
@@ -45,6 +46,7 @@ android {
 			}
 			minifyEnabled false
 			shrinkResources false
+			applicationIdSuffix '.debug'
 			signingConfig = signingConfigs.debug
 		}
 
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 2a0248e4e..71f3a4fe5 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -111,7 +111,7 @@
 
         <provider
             android:name="org.vita3k.emulator.provider.VitaDocumentsProvider"
-            android:authorities="org.vita3k.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">