diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7da23916a..6fd3cedef 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -314,7 +314,7 @@ platform :android do
 
     push_to_git_remote(tags: false)
 
-    build_and_upload_release(create_release: true, skip_confirm: skip_confirm)
+    build_and_upload_release(create_release: true)
 
     create_release_backmerge_pr(version_to_merge: version, next_version: release_version_next)
 
@@ -425,16 +425,13 @@ platform :android do
   end
 
   desc 'Builds and updates for distribution'
-  lane :build_and_upload_release do |create_release:, skip_confirm: false|
-    android_build_prechecks(
-      skip_confirm: skip_confirm,
-      alpha: false,
-      beta: false,
-      final: true
-    )
+  lane :build_and_upload_release do |create_release:|
+    ensure_git_status_clean unless is_ci
+    ensure_git_branch_is_release_branch!
+
+    # We want the full version name, including the rc prefix
+    version = VERSION_FILE.read_version_name
 
-    # Create the file names
-    version = android_get_release_version
     build_and_upload_apk(
       version: version,
       upload_track: 'production'