diff --git a/apps/android-tv/gradle.properties b/apps/android-tv/gradle.properties
index 2055bc4..cc80e2a 100644
--- a/apps/android-tv/gradle.properties
+++ b/apps/android-tv/gradle.properties
@@ -1,9 +1,12 @@
-# Lichter voor ~16GB RAM + Android Studio open
-org.gradle.jvmargs=-Xmx1024m -XX:MaxMetaspaceSize=384m -Dfile.encoding=UTF-8
+# Stabieler op ~16GB RAM + Android Studio (Kotlin daemon crashte vaak)
+org.gradle.jvmargs=-Xmx1536m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -Dfile.encoding=UTF-8
 org.gradle.parallel=false
 org.gradle.workers.max=1
 org.gradle.caching=true
+org.gradle.daemon=true
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
-kotlin.daemon.jvmargs=-Xmx768m
+# Compile in-process i.p.v. aparte Kotlin-daemon (voorkomt RMI Connection refused)
+kotlin.compiler.execution.strategy=in-process
+kotlin.incremental=false