diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 19bb2ea84b..1c5cb01b95 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,8 +37,6 @@ plugins {
 android {
     namespace = "io.element.android.x"
 
-    testOptions { unitTests.isIncludeAndroidResources = true }
-
     defaultConfig {
         applicationId = "io.element.android.x"
         targetSdk = Versions.targetSdk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2917c5199b..ffd0265584 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,8 +35,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
+            android:exported="false">
 
             <meta-data
                 android:name='androidx.lifecycle.ProcessLifecycleInitializer'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e6636ae66..51eb3a2a39 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.0.2"
+android_gradle_plugin = "8.1.0"
 kotlin = "1.9.0"
 ksp = "1.9.0-1.0.12"
 molecule = "1.2.0"
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 7b754f9623..e3f7b3682e 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -23,7 +23,7 @@ import org.gradle.api.Project
 import java.io.File
 import org.gradle.accessors.dm.LibrariesForLibs
 
-fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
+fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) {
     defaultConfig {
         compileSdk = Versions.compileSdk
         minSdk = Versions.minSdk
@@ -49,7 +49,7 @@ fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
     }
 }
 
-fun CommonExtension<*, *, *, *>.composeConfig(libs: LibrariesForLibs) {
+fun CommonExtension<*, *, *, *, *>.composeConfig(libs: LibrariesForLibs) {
 
     buildFeatures {
         compose = true