diff --git a/remove_packages.mk b/remove_packages.mk
index a313f1a..90bace2 100644
--- a/remove_packages.mk
+++ b/remove_packages.mk
@@ -1,7 +1,7 @@
 # This file is sourced by builds to remove certain apps/features
 
-# Remove stock aosp packages
-PRODUCT_PACKAGES -= \
+# Remove stock aosp packages using filter-out (more reliable than -=)
+PRODUCT_PACKAGES := $(filter-out \
     WebViewShell \
     Launcher3 \
     Launcher3QuickStep \
@@ -15,4 +15,5 @@ PRODUCT_PACKAGES -= \
     NoiseField \
     PhaseBeam \
     VisualizationWallpapers \
-    PhotoTable
\ No newline at end of file
+    PhotoTable, \
+    $(PRODUCT_PACKAGES))
\ No newline at end of file