diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index bf7ca2735..c67d47808 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -77,7 +77,6 @@ if (nativeTarget == null) nativeTarget = ""
 
 android {
     compileSdkVersion 33
-    buildToolsVersion "33.0.0"
     ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig.applicationId = "xyz.nextalone.nagram"
@@ -346,6 +345,9 @@ android {
     lint {
         disable 'MissingTranslation', 'ExtraTranslation', 'BlockedPrivateApi'
     }
+    buildFeatures {
+        buildConfig true
+    }
 
     tasks.configureEach { task ->
         if (task.name.startsWith("uploadCrashlyticsMappingFile")) {
diff --git a/build.gradle b/build.gradle
index 60b772892..c28d02a9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.3.0'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
diff --git a/gradle.properties b/gradle.properties
index 2981f1d93..7604a8c9a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,6 +22,5 @@ org.gradle.configureondemand=false
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8.fullMode=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c583a7024..ec04d0ac9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 17 16:55:16 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
index 011c25303..a4f1ccc53 100644
--- a/openpgp-api/build.gradle
+++ b/openpgp-api/build.gradle
@@ -9,7 +9,6 @@ android {
         targetSdkVersion 33
     }
 
-    buildToolsVersion '33.0.0'
     lint {
         abortOnError false
     }