diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index ad3f0f62fb7..5390fe0acf3 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8
+kotlin.daemon.jvmargs=-Xmx2200m # Should be the same as in the main project to avoid spawning second daemon
 
 cacheRedirectorEnabled=true
 
diff --git a/gradle.properties b/gradle.properties
index 48b9e33f509..4ee31f711d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8 -Dorg.gradle.internal.publish.checksums.insecure=true
+org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8 -Dorg.gradle.internal.publish.checksums.insecure=true
+kotlin.daemon.jvmargs=-Xmx2200m
 
 org.gradle.parallel=true
 org.gradle.caching=true