diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9f6683654a..8db9f1ace1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -153,6 +153,7 @@ android {
     //Deleting it causes a binding error
     buildFeatures {
         dataBinding = true
+        buildConfig = true
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 04b3e46ec4..e3e0426ab5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.4")
+        classpath("com.android.tools.build:gradle:8.2.0")
         classpath("com.google.gms:google-services:4.4.0")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 7cd2f0a647..223da698c9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,7 @@
 object KtsBuildVersions {
 
-    const val gradle = "8.1.3"
-    const val kotlin = "1.9.0"
+    const val gradle = "8.2.0"
+    const val kotlin = "1.9.10"
 }
 
 plugins {
diff --git a/gradle.properties b/gradle.properties
index 743829c702..dc962a673a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,5 +32,4 @@ android.nonTransitiveRClass=true
 # null: KtCallExpression
 # https://youtrack.jetbrains.com/issue/KT-58027
 kapt.use.jvm.ir=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=true
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
index ad13b8e525..ce0b3e4539 100644
--- a/wear/build.gradle.kts
+++ b/wear/build.gradle.kts
@@ -86,6 +86,9 @@ android {
             versionName = Versions.appVersion + "-aapsclient2"
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 allprojects {