diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 95adfc66..3106b7aa 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1185,14 +1185,9 @@ def insert_localized_app_metadata(apps):
 
             # flavors specified in build receipt
             build_flavors = []
-            if (
-                apps[packageName]
-                and len(apps[packageName].get('Builds', [])) > 0
-                and 'gradle' in apps[packageName]['Builds'][-1]
-                and apps[packageName]['Builds'][-1]['gradle'] != ['yes']
-            ):
+            if builds and 'gradle' in builds[-1] and builds[-1]['gradle'] != ['yes']:
                 build_flavors = common.calculate_gradle_flavor_combination(
-                    apps[packageName]['Builds'][-1]['gradle']
+                    builds[-1]['gradle']
                 )
 
             if len(segments) >= 5 and segments[4] == "fastlane" and segments[3] not in build_flavors:
@@ -1234,9 +1229,7 @@ def insert_localized_app_metadata(apps):
                     try:
                         versionCode = int(base)
                         locale = segments[-2]
-                        if versionCode in [
-                            a["versionCode"] for a in apps[packageName]["Builds"]
-                        ]:
+                        if versionCode in [b["versionCode"] for b in builds]:
                             _set_localized_text_entry(
                                 apps[packageName],
                                 locale,