diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index a9a6fb33f..3acfdf19a 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -15,6 +15,7 @@ plugins {
     alias(libs.plugins.mifos.android.application.compose)
     alias(libs.plugins.mifos.android.application.flavors)
     alias(libs.plugins.mifos.android.hilt)
+    alias(libs.plugins.gms)
     id("com.google.android.gms.oss-licenses-plugin")
 }
 
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index b5b893ef1..30ba986d6 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -16,16 +16,7 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature android:name="android.hardware.camera.any" />
-
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
 
     <uses-permission
         android:name="com.google.android.gms.permission.AD_ID"
@@ -81,6 +72,28 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/fileproviderpath" />
         </provider>
+
+        <!-- Prompt Google Play services to install the backported photo picker module -->
+        <service android:name="com.google.android.gms.metadata.ModuleDependencies" android:enabled="false" android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+
+            <meta-data android:name="photopicker_activity:0:required" android:value="" />
+        </service>
+
+        <!-- Disable Firebase analytics by default. This setting is overwritten for the `prod` flavor -->
+        <meta-data
+            android:name="firebase_analytics_collection_deactivated"
+            android:value="true" />
+        <!-- Disable collection of AD_ID for all build variants -->
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="false" />
+        <!-- Firebase automatically adds the following property which we don't use so remove it -->
+        <property
+            android:name="android.adservices.AD_SERVICES_CONFIG"
+            tools:node="remove" />
     </application>
 
 </manifest>
diff --git a/fastlane-config/android_config.rb b/fastlane-config/android_config.rb
new file mode 100644
index 000000000..523d4e1f3
--- /dev/null
+++ b/fastlane-config/android_config.rb
@@ -0,0 +1,23 @@
+module FastlaneConfig
+  module AndroidConfig
+    STORE_CONFIG = {
+      default_store_file: "release_keystore.keystore",
+      default_store_password: "mifos1234",
+      default_key_alias: "mifos-mobile",
+      default_key_password: "mifos1234"
+    }
+
+    FIREBASE_CONFIG = {
+      firebase_prod_app_id: "1:728434912738:android:d853a78f14af0c381a1dbb",
+      firebase_demo_app_id: "1:728434912738:android:7845cce9777d9cf11a1dbb",
+      firebase_service_creds_file: "secrets/firebaseAppDistributionServiceCredentialsFile.json",
+      firebase_groups: "mifos-mobile-testers"
+    }
+
+    BUILD_PATHS = {
+      prod_apk_path: "androidApp/build/outputs/apk/prod/release/androidApp-prod-release.apk",
+      demo_apk_path: "androidApp/build/outputs/apk/demo/release/androidApp-demo-release.apk",
+      prod_aab_path: "androidApp/build/outputs/bundle/prodRelease/androidApp-prod-release.aab"
+    }
+  end
+end
\ No newline at end of file
diff --git a/fastlane-config/ios_config.rb b/fastlane-config/ios_config.rb
new file mode 100644
index 000000000..29c4bc36c
--- /dev/null
+++ b/fastlane-config/ios_config.rb
@@ -0,0 +1,15 @@
+module FastlaneConfig
+  module IosConfig
+    FIREBASE_CONFIG = {
+      firebase_app_id: "1:728434912738:ios:shjhsa78392shja",
+      firebase_service_creds_file: "secrets/firebaseAppDistributionServiceCredentialsFile.json",
+      firebase_groups: "kmp-project-template-testers"
+    }
+
+    BUILD_CONFIG = {
+      project_path: "cmp-ios/iosApp.xcodeproj",
+      scheme: "iosApp",
+      output_directory: "cmp-ios/build"
+    }
+  end
+end
\ No newline at end of file
diff --git a/fastlane/FastFile b/fastlane/FastFile
index d1ca45fa8..c0f8489e2 100644
--- a/fastlane/FastFile
+++ b/fastlane/FastFile
@@ -1,3 +1,9 @@
+project_dir = File.expand_path('..', Dir.pwd)
+
+require_relative File.join(project_dir, 'fastlane-config', 'android_config')
+require_relative File.join(project_dir, 'fastlane-config', 'ios_config')
+require_relative './config/config_helpers'
+
 default_platform(:android)
 
 platform :android do
@@ -10,10 +16,7 @@ platform :android do
 
   desc "Assemble Release APK"
   lane :assembleReleaseApks do |options|
-    options[:storeFile] ||= "release_keystore.keystore"
-    options[:storePassword] ||= "mifos1234"
-    options[:keyAlias] ||= "mifos-mobile"
-    options[:keyPassword] ||= "mifos1234"
+    signing_config = FastlaneConfig.get_android_signing_config(options)
 
     # Generate version
     generateVersion = generateVersion()
@@ -21,50 +24,34 @@ platform :android do
     buildAndSignApp(
       taskName: "assemble",
       buildType: "Release",
-      storeFile: options[:storeFile],
-      storePassword: options[:storePassword],
-      keyAlias: options[:keyAlias],
-      keyPassword: options[:keyPassword],
+      **signing_config
     )
   end
 
   desc "Bundle Release APK"
   lane :bundleReleaseApks do |options|
-    options[:storeFile] ||= "release_keystore.keystore"
-    options[:storePassword] ||= "mifos1234"
-    options[:keyAlias] ||= "mifos-mobile"
-    options[:keyPassword] ||= "mifos1234"
+    signing_config = FastlaneConfig.get_android_signing_config(options)
 
     # Generate version
     generateVersion = generateVersion()
 
     buildAndSignApp(
-      taskName: "assemble",
+      taskName: "bundle",
       buildType: "Release",
-      storeFile: options[:storeFile],
-      storePassword: options[:storePassword],
-      keyAlias: options[:keyAlias],
-      keyPassword: options[:keyPassword],
+      **signing_config
     )
   end
 
   desc "Publish Release Artifacts to Firebase App Distribution"
   lane :deployReleaseApkOnFirebase do |options|
-    options[:appId] ||= "1:728434912738:android:d853a78f14af0c381a1dbb"
-    options[:apkFile] ||= "androidApp/build/outputs/apk/prod/release/androidApp-prod-release.apk"
-    options[:serviceCredsFile] ||= "secrets/firebaseAppDistributionServiceCredentialsFile.json"
-    options[:groups] ||= "mifos-mobile-testers"
-
-    options[:storeFile] ||= "release_keystore.keystore"
-    options[:storePassword] ||= "mifos1234"
-    options[:keyAlias] ||= "mifos-mobile"
-    options[:keyPassword] ||= "mifos1234"
+    signing_config = FastlaneConfig.get_android_signing_config(options)
+    firebase_config = FastlaneConfig.get_firebase_config(:android, :prod)
+    build_paths = FastlaneConfig::AndroidConfig::BUILD_PATHS
 
     # Generate version
     generateVersion = generateVersion(
         platform: "firebase",
-        appId: options[:appId],
-        serviceCredsFile: options[:serviceCredsFile]
+        **firebase_config
     )
 
     # Generate Release Note
@@ -73,39 +60,29 @@ platform :android do
     buildAndSignApp(
       taskName: "assembleProd",
       buildType: "Release",
-      storeFile: options[:storeFile],
-      storePassword: options[:storePassword],
-      keyAlias: options[:keyAlias],
-      keyPassword: options[:keyPassword],
+      **signing_config
     )
 
     firebase_app_distribution(
-      app: options[:appId],
+      app: firebase_config[:appId],
       android_artifact_type: "APK",
-      android_artifact_path: options[:apkFile],
-      service_credentials_file: options[:serviceCredsFile],
-      groups: options[:groups],
-      release_notes: "#{releaseNotes}",
+      android_artifact_path: build_paths[:prod_apk_path],
+      service_credentials_file: firebase_config[:serviceCredsFile],
+      groups: firebase_config[:groups],
+      release_notes: releaseNotes
     )
   end
 
   desc "Publish Demo Artifacts to Firebase App Distribution"
   lane :deployDemoApkOnFirebase do |options|
-    options[:appId] ||= "1:728434912738:android:7845cce9777d9cf11a1dbb"
-    options[:apkFile] ||= "androidApp/build/outputs/apk/demo/release/androidApp-demo-release.apk"
-    options[:serviceCredsFile] ||= "secrets/firebaseAppDistributionServiceCredentialsFile.json"
-    options[:groups] ||= "mifos-mobile-testers"
-
-    options[:storeFile] ||= "release_keystore.keystore"
-    options[:storePassword] ||= "mifos1234"
-    options[:keyAlias] ||= "mifos-mobile"
-    options[:keyPassword] ||= "mifos1234"
+    signing_config = FastlaneConfig.get_android_signing_config(options)
+    firebase_config = FastlaneConfig.get_firebase_config(:android, :demo)
+    build_paths = FastlaneConfig::AndroidConfig::BUILD_PATHS
 
-    # Generate version with app ID
+    # Generate version
     generateVersion = generateVersion(
       platform: "firebase",
-      appId: options[:appId],
-      serviceCredsFile: options[:serviceCredsFile]
+      **firebase_config
     )
 
     # Generate Release Note
@@ -114,62 +91,48 @@ platform :android do
     buildAndSignApp(
       taskName: "assembleDemo",
       buildType: "Release",
-      storeFile: options[:storeFile],
-      storePassword: options[:storePassword],
-      keyAlias: options[:keyAlias],
-      keyPassword: options[:keyPassword],
+      **signing_config
     )
 
     firebase_app_distribution(
-      app: options[:appId],
+      app: firebase_config[:appId],
       android_artifact_type: "APK",
-      android_artifact_path: options[:apkFile],
-      service_credentials_file: options[:serviceCredsFile],
-      groups: options[:groups],
-      release_notes: "#{releaseNotes}",
+      android_artifact_path: build_paths[:demo_apk_path],
+      service_credentials_file: firebase_config[:serviceCredsFile],
+      groups: firebase_config[:groups],
+      release_notes: releaseNotes
     )
   end
 
   desc "Deploy internal tracks to Google Play"
   lane :deployInternal do |options|
-    options[:aabFile] ||= "androidApp/build/outputs/bundle/prodRelease/androidApp-prod-release.aab"
-    options[:storeFile] ||= "release_keystore.keystore"
-    options[:storePassword] ||= "mifos1234"
-    options[:keyAlias] ||= "mifos-mobile"
-    options[:keyPassword] ||= "mifos1234"
+    signing_config = FastlaneConfig.get_android_signing_config(options)
+    build_paths = FastlaneConfig::AndroidConfig::BUILD_PATHS
 
     # Generate version
-    generateVersion = generateVersion(
-        platform: "playstore"
-    )
+    generateVersion = generateVersion(platform: "playstore")
 
     # Generate Release Note
     releaseNotes = generateReleaseNote()
 
     # Write the generated release notes to default.txt
     buildConfigPath = "metadata/android/en-US/changelogs/default.txt"
-
-    # Create directories if they don't exist
-    require 'fileutils'
     FileUtils.mkdir_p(File.dirname(buildConfigPath))
-
     File.write(buildConfigPath, releaseNotes)
 
     buildAndSignApp(
       taskName: "bundleProd",
       buildType: "Release",
-      storeFile: options[:storeFile],
-      storePassword: options[:storePassword],
-      keyAlias: options[:keyAlias],
-      keyPassword: options[:keyPassword],
+      **signing_config
     )
 
     upload_to_play_store(
       track: 'internal',
-      aab: options[:aabFile],
+      aab: build_paths[:prod_aab_path],
       skip_upload_metadata: true,
       skip_upload_images: true,
       skip_upload_screenshots: true,
+      skip_upload_apk: true,
     )
   end
 
@@ -227,7 +190,6 @@ platform :android do
 
   desc "Generate Version for different platforms"
   lane :generateVersion do |options|
-    # Default to 'git' if no platform specified
     platform = (options[:platform] || 'git').downcase
 
     # Generate version file for all platforms
@@ -239,45 +201,28 @@ platform :android do
 
     case platform
     when 'playstore'
-      # Get current version codes from both production and beta
-      prod_codes = google_play_track_version_codes(
-        track: 'production',
-      )
-      beta_codes = google_play_track_version_codes(
-        track: 'beta',
-      )
-
-      # Find highest version code
+      prod_codes = google_play_track_version_codes(track: 'production')
+      beta_codes = google_play_track_version_codes(track: 'beta')
       latest_code = (prod_codes + beta_codes).max || 1
       ENV['VERSION_CODE'] = (latest_code + 1).to_s
 
     when 'firebase'
-      service_creds = options[:serviceCredsFile] ||= "secrets/firebaseAppDistributionServiceCredentialsFile.json"
-      app_id = options[:appId] ||= "1:728434912738:android:d853a78f14af0c381a1dbb"
-
       begin
-        # Get latest release from Firebase App Distribution
         latest_release = firebase_app_distribution_get_latest_release(
-          app: app_id,
-          service_credentials_file: service_creds
+          app: options[:appId],
+          service_credentials_file: options[:serviceCredsFile]
         )
-
-        # Extract and increment the build version
         latest_build_version = latest_release ? latest_release[:buildVersion].to_i : 0
         ENV['VERSION_CODE'] = (latest_build_version + 1).to_s
-
       rescue => e
         UI.error("Error generating Firebase version: #{e.message}")
-        UI.error(e.backtrace.join("\n"))
         raise e
       end
 
     when 'git'
       # Calculate version code from git history
       commit_count = `git rev-list --count HEAD`.to_i
-      tag_count = `git tag | grep -v beta | wc -l`.to_i
       ENV['VERSION_CODE'] = (commit_count << 1).to_s
-
     else
       UI.user_error!("Unsupported platform: #{platform}. Supported platforms are: playstore, firebase, git")
     end
@@ -285,8 +230,6 @@ platform :android do
     # Output the results
     UI.success("Generated version for #{platform}")
     UI.success("Set VERSION=#{ENV['VERSION']} VERSION_CODE=#{ENV['VERSION_CODE']}")
-
-    # Return the values for potential further use
     version
   end
 
@@ -298,111 +241,54 @@ platform :android do
     releaseNotes
   end
 
-  desc "Generate release notes from specified tag or latest release tag"
+  desc "Generate full release notes from specified tag or latest release tag"
   lane :generateFullReleaseNote do |options|
-    # Platform-independent way to get the latest tag
     def get_latest_tag
-      begin
-        # Try to get the latest tag without redirection
-        latest = `git describe --tags --abbrev=0`.strip
-        return latest unless latest.empty?
-      rescue
-        begin
-          # Alternative approach if the first one fails
-          latest = `git tag --sort=-creatordate`.split("\n").first
-          return latest unless latest.nil? || latest.empty?
-        rescue
-          return nil
-        end
-      end
+      latest = `git describe --tags --abbrev=0`.strip
+      return latest unless latest.empty?
+
+      latest = `git tag --sort=-creatordate`.split("\n").first
+      return latest unless latest.nil? || latest.empty?
+
       nil
     end
 
-    # Get the tag from options or find the latest tag
-    from_tag = options[:fromTag]
-    if from_tag
-      UI.message "Using specified tag: #{from_tag}"
-      # Verify the tag exists
-      unless system("git rev-parse #{from_tag}")
-        UI.user_error! "Tag #{from_tag} not found!"
-        return
-      end
-    else
-      from_tag = get_latest_tag
-      if from_tag && !from_tag.empty?
-        UI.message "Using latest tag: #{from_tag}"
-      else
-        UI.message "No tags found. Getting all commits..."
-      end
-    end
+    from_tag = options[:fromTag] || get_latest_tag
+    UI.message "Using tag: #{from_tag || 'No tags found. Getting all commits...'}"
 
-    # Get commits since the tag
     commits = if from_tag && !from_tag.empty?
       `git log #{from_tag}..HEAD --pretty=format:"%B"`.split("\n")
     else
       `git log --pretty=format:"%B"`.split("\n")
     end
 
-    # Process commits to get actual commit messages and remove Co-authored-by lines
-    processed_commits = []
-    current_commit = []
-
-    commits.each do |line|
-      # Skip empty lines and Co-authored-by lines
-      next if line.empty? || line.start_with?("Co-authored-by:")
-
-      if line.start_with?("Merge pull request")
-        # For merge commits, we want to get the actual commit message
-        next
-      elsif current_commit.empty? || !line.start_with?(" ")
-        # If it's a new commit message, store the previous one (if exists) and start a new one
-        processed_commits << current_commit.join(" ") unless current_commit.empty?
-        current_commit = [line]
-      else
-        # Continue with current commit message
-        current_commit << line
-      end
-    end
-    # Add the last commit
-    processed_commits << current_commit.join(" ") unless current_commit.empty?
-
-    # Remove empty strings and duplicates
-    processed_commits = processed_commits.reject(&:empty?).uniq
+    categories = process_commits(commits)
+    format_release_notes(categories)
+  end
 
-    # Initialize categories
+  private_lane :process_commits do |commits|
     notes = {
-      "feat" => [],      # Features
-      "fix" => [],       # Bug fixes
-      "perf" => [],      # Performance
-      "refactor" => [],  # Refactoring
-      "style" => [],     # Style
-      "docs" => [],      # Documentation
-      "test" => [],      # Tests
-      "build" => [],     # Build
-      "ci" => [],        # CI
-      "chore" => [],     # Maintenance
-      "breaking" => [],  # Breaking changes
-      "other" => []      # Other
+      "breaking" => [], "feat" => [], "fix" => [],
+      "perf" => [], "refactor" => [], "style" => [],
+      "docs" => [], "test" => [], "build" => [],
+      "ci" => [], "chore" => [], "other" => []
     }
 
-    # Categorize commits
-    processed_commits.each do |commit|
-      # Handle breaking changes
+    commits.each do |commit|
+      next if commit.empty? || commit.start_with?("Co-authored-by:", "Merge")
+
       if commit.include?("BREAKING CHANGE:") || commit.include?("!")
         notes["breaking"] << commit.sub(/^[^:]+:\s*/, "")
-        next
-      end
-
-      # Match conventional commit format
-      if commit =~ /^(feat|fix|perf|refactor|style|docs|test|build|ci|chore)(\(.+?\))?:/
-        type = $1
-        notes[type] << commit.sub(/^[^:]+:\s*/, "")
+      elsif commit =~ /^(feat|fix|perf|refactor|style|docs|test|build|ci|chore)(\(.+?\))?:/
+        notes[$1] << commit.sub(/^[^:]+:\s*/, "")
       else
-        notes["other"] << commit unless commit.start_with?("Merge")
+        notes["other"] << commit
       end
     end
+    notes
+  end
 
-    # Format release notes
+  private_lane :format_release_notes do |categories|
     sections = {
       "breaking" => "💥 Breaking Changes",
       "feat" => "🚀 New Features",
@@ -418,24 +304,17 @@ platform :android do
       "other" => "📝 Other Changes"
     }
 
-    # Build release notes
-    release_notes = ["# Release Notes"]
-    release_notes << "\nRelease date: #{Time.now.strftime('%d-%m-%Y')}"
+    notes = ["# Release Notes", "\nRelease date: #{Time.now.strftime('%d-%m-%Y')}"]
 
     sections.each do |type, title|
-      next if notes[type].empty?
-      release_notes << "\n## #{title}"
-      notes[type].each do |commit|
-        release_notes << "\n- #{commit}"
-      end
+      next if categories[type].empty?
+      notes << "\n## #{title}"
+      categories[type].each { |commit| notes << "\n- #{commit}" }
     end
 
-    # Print release notes
     UI.message "Generated Release Notes:"
-    UI.message release_notes.join("\n")
-
-    # Return the release notes string
-    release_notes.join("\n")
+    UI.message notes.join("\n")
+    notes.join("\n")
   end
 
 end
@@ -445,51 +324,52 @@ platform :ios do
   lane :build_ios do |options|
     # Set default configuration if not provided
     options[:configuration] ||= "Debug"
+    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
 
-    # automatic code signing
     update_code_signing_settings(
       use_automatic_signing: true,
-      path: "mifos-ios/iosApp.xcodeproj"
+      path: ios_config[:project_path]
     )
+
     build_ios_app(
-      project: "mifos-ios/iosApp.xcodeproj",
-      scheme: "iosApp",
-      # Set configuration to debug for now
+      project: ios_config[:project_path],
+      scheme: ios_config[:scheme],
       configuration: options[:configuration],
       skip_codesigning: "true",
-      output_directory: "mifos-ios/build",
+      output_directory: ios_config[:output_directory],
       skip_archive: "true"
     )
   end
 
   lane :increment_version do |options|
-    options[:serviceCredsFile] ||= "secrets/firebaseAppDistributionServiceCredentialsFile.json"
+    firebase_config = FastlaneConfig.get_firebase_config(:ios)
+    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
 
     latest_release = firebase_app_distribution_get_latest_release(
-      app: "1:728434912738:ios:86a7badfaed88b841a1dbb",
-      service_credentials_file: options[:serviceCredsFile]
+      app: firebase_config[:appId],
+      service_credentials_file: options[:serviceCredsFile] || firebase_config[:serviceCredsFile]
     )
+
     increment_build_number(
-      xcodeproj: "mifos-ios/iosApp.xcodeproj",
+      xcodeproj: ios_config[:project_path],
       build_number: latest_release[:buildVersion].to_i + 1
     )
   end
 
   desc "Upload iOS application to Firebase App Distribution"
   lane :deploy_on_firebase do |options|
-    options[:serviceCredsFile] ||= "secrets/firebaseAppDistributionServiceCredentialsFile.json"
-    options[:groups] ||= "mifos-mobile-testers"
+    firebase_config = FastlaneConfig.get_firebase_config(:ios)
 
-    increment_version()
+    increment_version(serviceCredsFile: firebase_config[:serviceCredsFile])
     build_ios()
     releaseNotes = generateReleaseNote()
-    release = firebase_app_distribution(
-      app: "1:728434912738:ios:86a7badfaed88b841a1dbb",
-      service_credentials_file: options[:serviceCredsFile],
-      release_notes_file: "#{releaseNotes}",
-      groups: options[:groups]
-    )
 
+    firebase_app_distribution(
+      app: firebase_config[:appId],
+      service_credentials_file: firebase_config[:serviceCredsFile],
+      release_notes: releaseNotes,
+      groups: firebase_config[:groups]
+    )
   end
 
   desc "Generate release notes"
diff --git a/fastlane/Pluginfile b/fastlane/PluginFile
similarity index 100%
rename from fastlane/Pluginfile
rename to fastlane/PluginFile
diff --git a/fastlane/README.md b/fastlane/README.md
index fba227b9c..c8de7f002 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -101,7 +101,7 @@ Generate release notes
 [bundle exec] fastlane android generateFullReleaseNote
 ```
 
-Generate release notes from specified tag or latest release tag
+Generate full release notes from specified tag or latest release tag
 
 ----
 
diff --git a/fastlane/config/config_helpers.rb b/fastlane/config/config_helpers.rb
new file mode 100644
index 000000000..ffd101524
--- /dev/null
+++ b/fastlane/config/config_helpers.rb
@@ -0,0 +1,32 @@
+require_relative '../../fastlane-config/android_config'
+require_relative '../../fastlane-config/ios_config'
+
+module FastlaneConfig
+  # Move methods directly into FastlaneConfig module instead of nested Helpers module
+  def self.get_android_signing_config(options = {})
+    {
+      storeFile: options[:store_file] || ENV['ANDROID_STORE_FILE'] || AndroidConfig::STORE_CONFIG[:default_store_file],
+      storePassword: options[:store_password] || ENV['ANDROID_STORE_PASSWORD'] || AndroidConfig::STORE_CONFIG[:default_store_password],
+      keyAlias: options[:key_alias] || ENV['ANDROID_KEY_ALIAS'] || AndroidConfig::STORE_CONFIG[:default_key_alias],
+      keyPassword: options[:key_password] || ENV['ANDROID_KEY_PASSWORD'] || AndroidConfig::STORE_CONFIG[:default_key_password]
+    }
+  end
+
+  def self.get_firebase_config(platform, type = :prod)
+    case platform
+    when :android
+      app_id = type == :prod ? AndroidConfig::FIREBASE_CONFIG[:firebase_prod_app_id] : AndroidConfig::FIREBASE_CONFIG[:firebase_demo_app_id]
+      {
+        appId: ENV['FIREBASE_ANDROID_APP_ID'] || app_id,
+        serviceCredsFile: ENV['FIREBASE_SERVICE_CREDS_FILE'] || AndroidConfig::FIREBASE_CONFIG[:firebase_service_creds_file],
+        groups: ENV['FIREBASE_GROUPS'] || AndroidConfig::FIREBASE_CONFIG[:firebase_groups]
+      }
+    when :ios
+      {
+        appId: ENV['FIREBASE_IOS_APP_ID'] || IosConfig::FIREBASE_CONFIG[:firebase_app_id],
+        serviceCredsFile: ENV['FIREBASE_SERVICE_CREDS_FILE'] || IosConfig::FIREBASE_CONFIG[:firebase_service_creds_file],
+        groups: ENV['FIREBASE_GROUPS'] || IosConfig::FIREBASE_CONFIG[:firebase_groups]
+      }
+    end
+  end
+end
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index 4f4b2d8ca..6ab6d2183 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,6 +1 @@
-fix: API endpoint (#2733)
-* MM-102 KMP dependencies setup (#2729)
-* fix: API endpoint
----------
-Co-authored-by: Sk Niyaj Ali <skniyajali0@gmail.com>
-Co-authored-by: Pronay Sarker <pronaycoding@gmail.com>s
\ No newline at end of file
+fix: Prevent app crash when clicking Mifos Initiative License and Change icon colors (#2748)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 577fabcef..36e0d450e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,7 +10,7 @@ pluginManagement {
 }
 
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
         mavenCentral()
@@ -21,16 +21,14 @@ dependencyResolutionManagement {
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
-    id("org.ajoberstar.reckon.settings") version("0.18.3")
+    id("org.ajoberstar.reckon.settings") version("0.19.1")
 }
 
 extensions.configure<ReckonExtension> {
     setDefaultInferredScope("patch")
-    stages("beta", "final")
-    setScopeCalc { java.util.Optional.of(org.ajoberstar.reckon.core.Scope.PATCH) }
+    stages("beta", "rc", "final")
     setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
     setStageCalc(calcStageFromProp())
-    setTagWriter { it.toString() }
 }
 
 rootProject.name = "mifos-mobile"