diff --git a/.forgejo/workflows/build_release.yml b/.forgejo/workflows/build_release.yml
index 4c3c0b044..02e29f9a0 100755
--- a/.forgejo/workflows/build_release.yml
+++ b/.forgejo/workflows/build_release.yml
@@ -102,23 +102,38 @@ jobs:
             printf 'sdk.dir=%s\n' "$ANDROID_HOME" > local.properties
           fi
           chmod +x ./gradlew
-          GRADLE_OPTS="-Xmx2g -XX:MaxMetaspaceSize=768m -Dkotlin.daemon.enabled=false -Dkotlin.compiler.execution.strategy=in-process" \
-            ./gradlew --no-daemon --max-workers=1 --version
+          ./gradlew --no-daemon --max-workers=1 \
+            "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=768m -Dfile.encoding=UTF-8" \
+            -Dkotlin.daemon.enabled=false \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            --version
 
       - name: Check code format
         run: |
-          GRADLE_OPTS="-Xmx2g -XX:MaxMetaspaceSize=768m -Dkotlin.daemon.enabled=false -Dkotlin.compiler.execution.strategy=in-process" \
-            ./gradlew --no-daemon --max-workers=1 spotlessCheck
+          ./gradlew --no-daemon --max-workers=1 \
+            "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=768m -Dfile.encoding=UTF-8" \
+            -Dkotlin.daemon.enabled=false \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            --stacktrace --info \
+            spotlessCheck
 
       - name: Build app
         run: |
-          GRADLE_OPTS="-Xmx2g -XX:MaxMetaspaceSize=768m -Dkotlin.daemon.enabled=false -Dkotlin.compiler.execution.strategy=in-process" \
-            ./gradlew --no-daemon --max-workers=1 assembleRelease -Penable-updater -Pdisable-code-shrink
+          ./gradlew --no-daemon --max-workers=1 \
+            "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=768m -Dfile.encoding=UTF-8" \
+            -Dkotlin.daemon.enabled=false \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            --stacktrace --info \
+            assembleRelease -Penable-updater -Pdisable-code-shrink
 
       - name: Run unit tests
         run: |
-          GRADLE_OPTS="-Xmx2g -XX:MaxMetaspaceSize=768m -Dkotlin.daemon.enabled=false -Dkotlin.compiler.execution.strategy=in-process" \
-            ./gradlew --no-daemon --max-workers=1 testReleaseUnitTest
+          ./gradlew --no-daemon --max-workers=1 \
+            "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=768m -Dfile.encoding=UTF-8" \
+            -Dkotlin.daemon.enabled=false \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            --stacktrace --info \
+            testReleaseUnitTest
 
       - name: Rename release artifacts
         shell: bash
diff --git a/gradle.properties b/gradle.properties
index 22e7dfed5..4c6f009f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,5 +6,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 
 org.gradle.caching=true
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=768m -Dfile.encoding=UTF-8
 org.gradle.parallel=true