diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 173f17d165..1057264be8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -183,6 +183,7 @@ android {
         compose = true
         dataBinding = true
         viewBinding = true
+        buildConfig = true
     }
 
     configurations.all {
diff --git a/app/src/androidTest/java/org/dhis2/common/coroutine/DispatcherTestingModule.kt b/app/src/androidTest/java/org/dhis2/common/coroutine/DispatcherTestingModule.kt
deleted file mode 100644
index 9b62b39bf9..0000000000
--- a/app/src/androidTest/java/org/dhis2/common/coroutine/DispatcherTestingModule.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.dhis2.common.coroutine
-
-import dagger.Module
-import dagger.Provides
-import org.dhis2.data.dispatcher.DispatcherModule
-import org.dhis2.commons.viewmodel.DispatcherProvider
-import org.dhis2.form.model.coroutine.EspressoTestingDispatcher
-import javax.inject.Singleton
-
-@Module
-class DispatcherTestingModule: DispatcherModule() {
-
-    @Provides
-    @Singleton
-    override fun provideDispatcherModule(): DispatcherProvider {
-        return EspressoTestingDispatcher()
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/dhis2/common/preferences/PreferencesTestingModule.kt b/app/src/androidTest/java/org/dhis2/common/preferences/PreferencesTestingModule.kt
index 4fa8aa7b8b..caf560f0f9 100644
--- a/app/src/androidTest/java/org/dhis2/common/preferences/PreferencesTestingModule.kt
+++ b/app/src/androidTest/java/org/dhis2/common/preferences/PreferencesTestingModule.kt
@@ -12,7 +12,7 @@ class PreferencesTestingModule : PreferenceModule() {
 
     @Provides
     @Singleton
-    override fun preferenceProvider(context: Context): PreferenceProvider {
+    fun providePreferenceProvider(context: Context): PreferenceProvider {
         return PreferenceTestingImpl(context)
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 0c663225a1..d072eea682 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,6 +34,5 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 
 android.suppressUnsupportedCompileSdk=32
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b1f7841b0b..d80b9fa257 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,10 +4,10 @@ sdk = "34"
 minSdk = "21"
 vCode = "128"
 vName = "2.9.1-DEV"
-kotlinCompilerExtensionVersion = "1.5.4"
+kotlinCompilerExtensionVersion = "1.5.6"
 
-gradle = "8.1.3"
-kotlin = '1.9.20'
+gradle = "8.2.0"
+kotlin = '1.9.21'
 hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'