diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index dc9df43..7145984 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -37,7 +37,7 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/gapps/overlay
 
 PRODUCT_PACKAGES += \
-    GmsSettingsOverlay \
     GmsOverlay \
+    GmsSettingsOverlay \
     GmsSettingsProviderOverlay \
     GmsSetupWizardOverlay
diff --git a/setup-makefiles.py b/setup-makefiles.py
index 5c4f859..ffe96b1 100755
--- a/setup-makefiles.py
+++ b/setup-makefiles.py
@@ -307,7 +307,7 @@ if __name__ == "__main__":
                 name="common",
                 soong_imports=[],
                 additional_namespaces=["vendor/gapps/overlay"],
-                additional_packages=[x.name for x in Path("overlay").glob("*Overlay")],
+                additional_packages=sorted([x.name for x in Path("overlay").glob("*Overlay")]),
                 additional_makefiles_to_inherit=[],
             ),
             GappsTarget(