diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f400b2ee7d..fba7c8e64b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -36,7 +36,7 @@ platform :android do
   end
 
   desc "Build a signed release APK"
-  lane :release do |options|
+  lane :release do |options|  # TODO: remove after fully moving from old CI
      gradle(
        task: "clean assemble",
        build_type: "Release",
@@ -49,14 +49,8 @@ platform :android do
   end
 
   desc "Build external and release APKs"
-  lane :build do |options|
-     gradle(task: 'clean') # TODO: remove after fully moving from old CI
-
-     launched_from_github_action = options[:launched_from_github_action] || false # TODO: remove after fully moving from old CI
-     if launched_from_github_action
-         FileUtils.cp("../ci_resources/build_ci_gradle.properties", "../gradle.properties")
-         puts File.read("../gradle.properties")
-     end
+  lane :build do |options|  # TODO: remove after fully moving from old CI
+     gradle(task: 'clean')
 
      gradle(
        task: "bundle",
@@ -84,6 +78,37 @@ platform :android do
      )
   end
 
+  desc "Build release AAB and APKs"
+    lane :buildRelease do |options|
+       FileUtils.cp("../ci_resources/build_ci_gradle.properties", "../gradle.properties")
+       puts File.read("../gradle.properties")
+
+       gradle(
+         task: "bundle",
+         build_type: "Release",
+         properties: {
+            'versionCode' => options[:versionCode],
+            'versionName' => options[:versionName],
+            "android.injected.signing.store.file" => options[:keystore],
+            "android.injected.signing.store.password" => options[:store_password],
+            "android.injected.signing.key.alias" => options[:key_alias],
+            "android.injected.signing.key.password" => options[:key_password],
+         }
+       )
+       gradle(
+         task: "assemble",
+         build_type: "Release",
+         properties: {
+           'versionCode' => options[:versionCode],
+           'versionName' => options[:versionName],
+           "android.injected.signing.store.file" => options[:keystore],
+           "android.injected.signing.store.password" => options[:store_password],
+           "android.injected.signing.key.alias" => options[:key_alias],
+           "android.injected.signing.key.password" => options[:key_password],
+         }
+       )
+    end
+
   desc "Submit a new Beta Build to Firebase App Distribution"
   lane :beta do |options|
        firebase_app_distribution(