diff --git a/.github/workflows/tests-rust.yml b/.github/workflows/tests-rust.yml
index 6713f29bafa..803b0a08ab3 100644
--- a/.github/workflows/tests-rust.yml
+++ b/.github/workflows/tests-rust.yml
@@ -9,7 +9,7 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx3g" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
 
 jobs:
diff --git a/build.gradle b/build.gradle
index edf07c097ad..dae89f7aff0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -331,6 +331,10 @@ ext.initScreenshotTests = { project ->
     }
 }
 
+tasks.withType(Test) {
+    maxHeapSize = "2g"
+}
+
 // Workaround to have KSP generated Kotlin code available in the IDE (for code completion)
 // Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02
 subprojects { project ->
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 72719bb6d72..c7183b83658 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -216,7 +216,7 @@ dependencies {
 
     implementation libs.google.phonenumber
 
-    rustCryptoImplementation("org.matrix.rustcomponents:crypto-android:0.3.10")
+    rustCryptoImplementation("org.matrix.rustcomponents:crypto-android:0.3.14")
 //    rustCryptoApi project(":library:rustCrypto")
 
     testImplementation libs.tests.junit
diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index dbe30f22678..467b32bacdb 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -17,7 +17,7 @@
     <issue id="IconDuplicatesConfig" severity="error" />
     <issue id="IconDuplicates" severity="error" />
     <issue id="IconExpectedSize" severity="error" />
-    <issue id="LocaleFolder" severity="error" />
+    <issue id="LocaleFolder" severity="ignore" />
 
     <!-- AlwaysShowAction is considered as an error to force ignoring the issue when detected -->
     <issue id="AlwaysShowAction" severity="error" />