diff --git a/ci_resources/build_8gb_ram_ci_gradle.properties b/ci_resources/build_8gb_ram_ci_gradle.properties
new file mode 100644
index 0000000000..2a015194e2
--- /dev/null
+++ b/ci_resources/build_8gb_ram_ci_gradle.properties
@@ -0,0 +1,13 @@
+org.gradle.jvmargs=-Xmx7g -XX:MaxMetaspaceSize=512m -XX:+UseParallelGC -XX:ParallelGCThreads=3 -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+org.gradle.workers.max=3
+org.gradle.daemon=false
+org.gradle.unsafe.configuration-cache=false
+org.gradle.console=plain
+org.gradle.caching=false
+
+android.useAndroidX=true
+android.nonTransitiveRClass=false
+
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process
\ No newline at end of file
diff --git a/ci_resources/tests_8gb_ram_ci_gradle.properties b/ci_resources/tests_8gb_ram_ci_gradle.properties
new file mode 100644
index 0000000000..05b91953ed
--- /dev/null
+++ b/ci_resources/tests_8gb_ram_ci_gradle.properties
@@ -0,0 +1,12 @@
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=512m -XX:+UseParallelGC -XX:ParallelGCThreads=3 -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+org.gradle.workers.max=3
+org.gradle.daemon=false
+org.gradle.unsafe.configuration-cache=false
+org.gradle.console=plain
+org.gradle.caching=false
+
+android.useAndroidX=true
+android.nonTransitiveRClass=false
+
+kotlin.incremental=false
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1b4cd75d62..8cd62de4a4 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -23,7 +23,7 @@ platform :android do
 
   desc "Runs all the tests"
   lane :test do
-    FileUtils.cp("../ci_resources/8gb_ram_ci_gradle.properties", "../gradle.properties")
+    FileUtils.cp("../ci_resources/tests_8gb_ram_ci_gradle.properties", "../gradle.properties")
     puts File.read("../gradle.properties")
     gradle(task: "detekt")
     gradle(task: "testDebugUnitTest")
@@ -87,19 +87,22 @@ platform :android do
 
   desc "Publish internal and external builds to Firebase App Distribution"
   lane :publishToFirebase do |options|
+    FileUtils.cp("../ci_resources/build_8gb_ram_ci_gradle.properties", "../gradle.properties")
+    puts File.read("../gradle.properties")
     gradle(
       task: "clean assemble",
       build_type: "Internal",
       properties: {
-        'versionCode' => ENV['versionCode'],
-        'versionName' => ENV['versionName'],
+        'versionCode' => ENV['version_code'],
+        'versionName' => ENV['version_name'],
       }
     )
     firebase_app_distribution(
+      firebase_cli_token: ENV['firebase_cli_token'],
       app: ENV['app_id_internal'],
       apk_path: ENV['apk_path_internal'],
       groups: ENV['groups'],
-      release_notes: ENV['releaseNotes']
+      release_notes: ENV['release_notes'],
     )
   end
 end