diff --git a/debloater/Android.mk b/debloater/Android.mk
index 307b8be..affa9bb 100644
--- a/debloater/Android.mk
+++ b/debloater/Android.mk
@@ -9,35 +9,6 @@ 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 \
@@ -49,7 +20,9 @@ LOCAL_OVERRIDES_PACKAGES += \
     GooglePartnerSetup \
     GoogleFeedback \
     com.google.android.dialer.support \
-    Wellbeing
+    com.google.android.dialer.support.xml \
+    Wellbeing \
+    wellbeing.xml
 LOCAL_UNINSTALLABLE_MODULE := true
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_SRC_FILES := /dev/null