diff --git a/build.gradle b/build.gradle
index 4ec3397b3..d64f093fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.2.0"
         classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
diff --git a/gradle.properties b/gradle.properties
index 254e17fff..0dae6c8f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-VERSION_NAME=6.3.2
-VERSION_CODE=332
+VERSION_NAME=6.4.0
+VERSION_CODE=333
 PACKAGE=it.feio.android.omninotes
 MIN_SDK=21
 TARGET_SDK=33
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 95c805b3d..a2fefad5a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle
index 6d28a935e..58c980b4a 100644
--- a/omniNotes/build.gradle
+++ b/omniNotes/build.gradle
@@ -68,15 +68,13 @@ android {
 
 
     buildTypes {
-        debug {
-            testCoverageEnabled true
-        }
         release {
             minifyEnabled true
             shrinkResources false
             multiDexEnabled false
-            testCoverageEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            enableUnitTestCoverage false
+            enableAndroidTestCoverage false
             android.applicationVariants.all { variant ->
                 variant.outputs.all {
                     outputFileName = "OmniNotes-${variant.name}-${variant.versionName}.apk"
@@ -86,6 +84,10 @@ android {
                 signingConfig signingConfigs.release
             }
         }
+        debug {
+            enableUnitTestCoverage true
+            enableAndroidTestCoverage true
+        }
     }
 
     flavorDimensions = ["standard"]