diff --git a/debloater/Android.mk b/debloater/Android.mk
index affa9bb..307b8be 100644
--- a/debloater/Android.mk
+++ b/debloater/Android.mk
@@ -9,6 +9,35 @@ LOCAL_OVERRIDES_PACKAGES += \
     XiaomiEuicc \
     Stk \
     Jelly \
+    GoogleExtShared \
+    GooglePrintRecommendationService \
+    GooglePackageInstaller \
+    TagGoogle \
+    CalculatorGoogle \
+    CalendarGoogle \
+    DeskClockGoogle \
+    Drive \
+    Gmail2 \
+    GoogleContacts \
+    ConfigUpdater \
+    CrossDeviceServices \
+    FamilyLinkParentalControls \
+    FilesGoogle \
+    GWP \
+    GoogleDialer \
+    GoogleRestore \
+    Messages \
+    PersonalSafety \
+    GmsConfigOverlayPersonalSafety \
+    GmsSettingsOverlayPersonalSafety \
+    GmsSystemUIOverlayPersonalSafety \
+    Turbo \
+    GmsSettingsOverlayTurbo \
+    EmergencyInfoGms \
+    SetupWizard \
+    Maps \
+    Photos \
+    YouTube \
     SoterService \
     EuiccGoogle \
     EasterEgg \
@@ -20,9 +49,7 @@ LOCAL_OVERRIDES_PACKAGES += \
     GooglePartnerSetup \
     GoogleFeedback \
     com.google.android.dialer.support \
-    com.google.android.dialer.support.xml \
-    Wellbeing \
-    wellbeing.xml
+    Wellbeing
 LOCAL_UNINSTALLABLE_MODULE := true
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_SRC_FILES := /dev/null