diff --git a/android/app/build.gradle b/android/app/build.gradle
index e02bd4ff0..a1aa286c8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -4,6 +4,7 @@ android {
 	ndkVersion "$ndk_version"
 	defaultConfig {
 		applicationId 'net.minetest.minetest'
+		applicationIdSuffix 'test'
 		minSdkVersion 21
 		compileSdk 34
 		targetSdkVersion 35
@@ -40,13 +41,13 @@ android {
 	}
 
 	// for multiple APKs
-	splits {
-		abi {
-			enable true
-			reset()
-			include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+	defaultConfig {
+    externalNativeBuild {
+        cmake {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
 		}
 	}
+	}
 
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2e900ec53..3f749ae40 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
 	<application
 		android:allowBackup="false"
 		android:icon="@mipmap/ic_launcher"
-		android:label="@string/label"
+		android:label="Luanti (Test)"
 		android:resizeableActivity="false"
 		tools:ignore="UnusedAttribute">
 
@@ -52,7 +52,7 @@
 
 		<provider
 			android:name="androidx.core.content.FileProvider"
-			android:authorities="net.minetest.minetest.fileprovider"
+			android:authorities="net.minetest.minetest.test.fileprovider"
 			android:grantUriPermissions="true"
 			android:exported="false">
 			<meta-data
diff --git a/android/app/src/main/java/net/minetest/minetest/GameActivity.java b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
index 770c1c4f2..c85fec3dd 100644
--- a/android/app/src/main/java/net/minetest/minetest/GameActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
@@ -233,7 +233,7 @@ public class GameActivity extends SDLActivity {
 			return;
 		}
 
-		Uri fileUri = FileProvider.getUriForFile(this, "net.minetest.minetest.fileprovider", file);
+		Uri fileUri = FileProvider.getUriForFile(this, "net.minetest.minetest.test.fileprovider", file);
 
 		Intent intent = new Intent(Intent.ACTION_SEND, fileUri);
 		intent.setDataAndType(fileUri, getContentResolver().getType(fileUri));
diff --git a/android/native/build.gradle b/android/native/build.gradle
index 91629add7..fdb7e23e8 100644
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -24,13 +24,13 @@ android {
 	}
 
 	// supported architectures
-	splits {
-		abi {
-			enable true
-			reset()
-			include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+	defaultConfig {
+    externalNativeBuild {
+        cmake {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
 		}
 	}
+	}
 
 	buildTypes {
 		release {