diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 98d35c0a..b0ea98e8 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -67,13 +67,10 @@ jobs:
             -   name: Run analysis wrapper
                 env:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-                # Memory that is set in jvmargs must be wisely chosen.
-                # E.g. with -Xmx5g and -Xmx1g android talk builds always failed with "The operation was canceled". -Xmx3g seems to work so far.
                 run: |
                     mkdir -p "$HOME/.gradle"
                     {
-                        echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g"
+                        echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
                         echo "org.gradle.configureondemand=true"
                         echo "kapt.incremental.apt=true"
                     } > "$HOME/.gradle/gradle.properties"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8ff84161..39f146db 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -55,6 +55,6 @@ jobs:
         run: |
           mkdir -p "$HOME/.gradle"
           echo "org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
-          ./gradlew assembleDebug
+          ./gradlew --no-daemon assembleDebug
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6