diff --git a/app/build.gradle b/app/build.gradle
index 30781bfce0..c7ca7b839f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -208,6 +208,7 @@ android {
     buildFeatures {
         dataBinding true
         viewBinding true
+        aidl true
     }
 
     kotlinOptions {
diff --git a/build.gradle b/build.gradle
index f4772b6722..1401c902d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        androidPluginVersion = '7.4.2'
+        androidPluginVersion = '8.0.1'
         appCompatVersion = '1.6.1'
         jacoco_version = '0.8.10'
         kotlin_version = '1.8.21'
diff --git a/gradle.properties b/gradle.properties
index 94c2eed660..2577eff5cc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,7 @@ NC_TEST_SERVER_USERNAME=test
 NC_TEST_SERVER_PASSWORD=test
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 #android.debug.obsoleteApi=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e749e03625..e0a910084b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 13 08:21:45 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME