diff --git a/CLAUDE.md b/CLAUDE.md
index 802dd0f..41a8e39 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -165,7 +165,7 @@ The project uses optimized Gradle settings based on best practices from the [Now
 - Cached builds: ~2-8 seconds
 - Configuration cache significantly speeds up subsequent builds
 
-**Note:** These settings assume sufficient system RAM (4GB+ available for Gradle). On memory-constrained systems, the heap size may need adjustment.
+**Note:** These settings require at least **8GB+ of available RAM** (4GB for Gradle daemon + 4GB for Kotlin daemon). On memory-constrained systems, reduce the `-Xmx` values in `gradle.properties` (e.g., to 2GB each for systems with 4-6GB RAM).
 
 ## Build Types (Not Flavors)
 
diff --git a/gradle.properties b/gradle.properties
index 391de6f..6e67709 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Reference: https://github.com/android/nowinandroid/blob/main/gradle.properties
+# NOTE: These settings assume at least 8GB+ of available RAM (4GB for Gradle + 4GB for Kotlin daemon)
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx4g
 
 # Kotlin Daemon arguments with optimized GC settings