diff --git a/fastlane/FastFile b/fastlane/FastFile
index 5390ae632..590331349 100644
--- a/fastlane/FastFile
+++ b/fastlane/FastFile
@@ -68,7 +68,7 @@ platform :android do
     )
 
     # Generate Release Note
-    releaseNotes = generateFullReleaseNote()
+    releaseNotes = generateReleaseNote()
 
     buildAndSignApp(
       taskName: "assembleProd",
@@ -144,7 +144,7 @@ platform :android do
     )
 
     # Generate Release Note
-    releaseNotes = generateFullReleaseNote()
+    releaseNotes = generateReleaseNote()
 
     # Write the generated release notes to default.txt
     buildConfigPath = "metadata/android/en-US/changelogs/default.txt"
@@ -234,7 +234,8 @@ platform :android do
     gradle(tasks: ["versionFile"])
 
     # Set version from file with fallback
-    ENV['VERSION'] = File.read("../version.txt").strip rescue "1.0.0"
+    version = File.read("../version.txt").strip rescue "1.0.0"
+    ENV['VERSION'] = version
 
     case platform
     when 'playstore'
@@ -286,16 +287,13 @@ platform :android do
     UI.success("Set VERSION=#{ENV['VERSION']} VERSION_CODE=#{ENV['VERSION_CODE']}")
 
     # Return the values for potential further use
-    {
-      version: ENV['VERSION'],
-      version_code: ENV['VERSION_CODE']
-    }
+    version
   end
 
   desc "Generate release notes"
   lane :generateReleaseNote do |options|
     releaseNotes = changelog_from_git_commits(
-      commits_count: 1,
+      commits_count: 3,
     )
     releaseNotes
   end