diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 7ff2fdf12283..ff64649f7943 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,7 +54,10 @@ jobs:
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"
-          echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
-          ./gradlew --no-daemon assembleDebug
+          {
+            echo "org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError"
+            echo "kotlin.daemon.jvmargs=-Xmx4g -XX:+UseParallelGC"
+          } > "$HOME/.gradle/gradle.properties"
+          ./gradlew --no-daemon assembleGplayDebug
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
diff --git a/gradle.properties b/gradle.properties
index 491e9a674eb7..91f3dedc1c10 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ android.nonTransitiveRClass=true
 # JVM arguments to optimize heap usage, enable heap dump on out-of-memory errors, and set the file encoding
 org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 org.gradle.dependency.verification.console=verbose
-kotlin.daemon.jvmargs=-Xmx4g -XX:+UseParallelGC
+kotlin.daemon.jvmargs=-Xmx6g -XX:+UseParallelGC
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true