diff --git a/app/k9mail-jmap/build.gradle b/app/k9mail-jmap/build.gradle
index 78c7707d2..860e7fda4 100644
--- a/app/k9mail-jmap/build.gradle
+++ b/app/k9mail-jmap/build.gradle
@@ -112,8 +112,8 @@ android {
         jvmTarget = kotlinJvmVersion
     }
 
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 
     testOptions {
diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index 8938f2ee1..e8257a210 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -104,6 +104,11 @@ android {
         exclude 'kotlin/**'
     }
 
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
+
     compileOptions {
         sourceCompatibility javaVersion
         targetCompatibility javaVersion
diff --git a/build.gradle b/build.gradle
index 3b297024b..22321a941 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:${versions.kotlin}"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.2.1"