diff --git a/jami-android/app/build.gradle.kts b/jami-android/app/build.gradle.kts
index ae6075f0788333290fdf935954efe63c583ce2bb..7d27be3b4d08a32e07bfa33d3b8e9511530eb24c 100644
--- a/jami-android/app/build.gradle.kts
+++ b/jami-android/app/build.gradle.kts
@@ -77,11 +77,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     externalNativeBuild {
         cmake {
diff --git a/jami-android/build.gradle.kts b/jami-android/build.gradle.kts
index fcdf030a61216b9be7a9ab2276a77ae2c0a5e287..3e0f69fc6a1276c2264513bb60bda5ab142fc842 100644
--- a/jami-android/build.gradle.kts
+++ b/jami-android/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     val hilt_version by extra { "2.47" }
 
     dependencies {
-        classpath ("com.android.tools.build:gradle:7.4.2")
+        classpath ("com.android.tools.build:gradle:8.1.0")
         classpath ("com.google.gms:google-services:4.3.15")
         classpath ("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
         classpath ("com.google.dagger:hilt-android-gradle-plugin:$hilt_version")
diff --git a/jami-android/gradle.properties b/jami-android/gradle.properties
index b11225a0c243b892ce01e7c4842b1d3a13da4454..a71c72669f532198a46b4390172397d50ab66c61 100644
--- a/jami-android/gradle.properties
+++ b/jami-android/gradle.properties
@@ -3,3 +3,5 @@ org.gradle.jvmargs=-Xmx3048M
 android.useAndroidX=true
 android.enableJetifier=false
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/jami-android/gradle/wrapper/gradle-wrapper.properties b/jami-android/gradle/wrapper/gradle-wrapper.properties
index 7ae51c62254396a057ebaafa316b794f18af0e40..41797c3c49d14fbf624a1204f61f93bb1504bd10 100644
--- a/jami-android/gradle/wrapper/gradle-wrapper.properties
+++ b/jami-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jul 29 13:20:33 EDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jami-android/libjamiclient/build.gradle.kts b/jami-android/libjamiclient/build.gradle.kts
index 2337772f695817af60e0c578b6aae4fe44d17c96..2f52a2a1078c7a72c4c79116ee4f5ef50dba6027 100644
--- a/jami-android/libjamiclient/build.gradle.kts
+++ b/jami-android/libjamiclient/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }