diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 31738835b1d..dcf7c9f238a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -265,11 +265,15 @@ platform :android do
 
     desc "Submit HybridApp to 100% rollout on Google Play"
     lane :complete_hybrid_rollout do
-        productionVersionCode = google_play_track_version_codes(track: 'production')
+        productionVersionCodes = google_play_track_version_codes(
+                                            track: 'production',
+                                            package_name: "org.me.mobiexpensifyg",
+                                            json_key: './android/app/android-fastlane-json-key.json',
+                                        )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: '1',
             skip_upload_apk: true,
@@ -283,14 +287,15 @@ platform :android do
 
     desc "Update HybridApp rollout percentage on Google Play"
     lane :update_hybrid_rollout do |options|
-        productionVersionCode = google_play_track_version_codes(
+        productionVersionCodes = google_play_track_version_codes(
                                     track: 'production',
+                                    package_name: "org.me.mobiexpensifyg",
                                     json_key: './android/app/android-fastlane-json-key.json',
                                 )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: options[:rollout],
             skip_upload_apk: true,