diff --git a/gradle.properties b/gradle.properties
index d36392c1..d334742a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,9 @@ kapt.incremental.apt=true
 kapt.include.compile.classpath=false
 
 # New incremental compilation for Kotlin
-kotlin.incremental.useClasspathSnapshot=true
+kotlin.compiler.suppressExperimentalICOptimizationsWarning=true
+kotlin.compiler.keepIncrementalCompilationCachesInMemory=true
+kotlin.compiler.preciseCompilationResultsBackup=true
 kotlin.build.report.output=file
 
 # Enable AndroidX
@@ -43,11 +45,8 @@ android.dependencyResolutionAtConfigurationTime.disallow=true
 # Disallow parsing the manifest too early in the build process
 android.disableEarlyManifestParsing=true
 
-# Prevent CI stalling during setup
-android.experimental.testOptions.managedDevices.setupTimeoutMinutes=20
-
 # Disable warnings about unsupported features
-android.suppressUnsupportedOptionWarnings=android.dependencyResolutionAtConfigurationTime.disallow,android.disableEarlyManifestParsing,android.suppressUnsupportedOptionWarnings,,android.experimental.testOptions.managedDevices.setupTimeoutMinutes
+android.suppressUnsupportedOptionWarnings=android.dependencyResolutionAtConfigurationTime.disallow,android.disableEarlyManifestParsing,android.suppressUnsupportedOptionWarnings
 
 # Add opens for KAPT
 # https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-4862682.0-0