diff --git a/app/build.gradle b/app/build.gradle
index 68009bd70..a785dde97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,7 +83,7 @@ android {
     }
 
     androidResources {
-            generateLocaleConfig true
+        generateLocaleConfig true
     }
 
     packagingOptions {
@@ -162,3 +162,16 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:5.18.0'
     testImplementation 'org.robolectric:robolectric:4.15.1'
 }
+
+// Run the compiler as a separate process
+tasks.withType(JavaCompile).configureEach {
+    options.fork = true
+
+    // Enable Incremental Compilation
+    options.incremental = true
+}
+
+tasks.withType(Test).configureEach {
+    // Run tests in parallel
+    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+}
diff --git a/gradle.properties b/gradle.properties
index d452dee23..5e2474b85 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,13 @@
 # SPDX-FileCopyrightText: 2015-2024 Stefan Niedermann <info@niedermann.it>
 # SPDX-FileCopyrightText: 2024 Andy Scherzinger <info@andy-scherzinger.de>
 # SPDX-License-Identifier: GPL-3.0-or-later
-org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
-org.gradle.dependency.verification.console=verbose
-org.gradle.configuration-cache=true
 android.useAndroidX=true
+org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
+org.gradle.dependency.verification.console=verbose
+kotlin.daemon.jvmargs=-Xmx6144m -XX:+UseParallelGC
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+kapt.incremental.apt=true
+org.gradle.daemon=true
+org.gradle.configuration-cache=true
\ No newline at end of file
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d2f6ffac8..c13acd5cb 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3,6 +3,7 @@
    <configuration>
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
+      <keyring-format>armored</keyring-format>
       <trusted-artifacts>
          <trust group="com.android.tools.build" name="aapt2" version="8.4.1-11315950" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
          <trust file=".*-javadoc[.]jar" regex="true" reason="Android Studio downloads javadoc jars but doesn't add checksums - fixes building in AS"/>