diff --git a/device.mk b/device.mk
index a7ecf3a..3daf54a 100644
--- a/device.mk
+++ b/device.mk
@@ -89,7 +89,7 @@ PRODUCT_PACKAGES += \
 
 # Remove unwanted packages
 PRODUCT_PACKAGES += \
-    RemovePackages
+    RemovePackagesVince
 
 # Audio configuration
 PRODUCT_COPY_FILES += \
diff --git a/removepackages/Android.bp b/removepackages/Android.bp
new file mode 100644
index 0000000..a02bf59
--- /dev/null
+++ b/removepackages/Android.bp
@@ -0,0 +1,40 @@
+cc_prebuilt_binary {
+    name: "RemovePackagesVince",
+    overrides: [
+	    "AudioFX",
+ 	    "arcore",
+ 	    "AICorePrebuilt",
+ 	    "AiWallpapers",
+ 	    "AndroidAutoStubPrebuilt",
+ 	    "Camera2",
+ 	    "Calendar2",
+ 	    "Calendar",
+        "DevicePersonalizationPrebuiltPixel2020",
+ 	    "DeviceAsWebcam",
+        "DuckDuckGo",
+ 	    "Etar",
+        "Flash",
+ 	    "GoogleTTS",
+ 	    "Gallery2",
+ 	    "Jellyfish",
+ 	    "Jelly",
+ 	    "Maps",
+ 	    "Photos",
+ 	    "PixelThemesStub",
+ 	    "PixelThemesStub2022_and_newer",
+ 	    "PixelWallpapers2023",
+ 	    "PixelLiveWallpaperPrebuilt",
+ 	    "Recorder",
+ 	    "SnapCamera",
+ 	    "SafetyHubPrebuilt",
+ 	    "Seedvault",
+        "SimpleGallery",
+ 	    "TurboPrebuilt",
+ 	    "WellbeingPrebuilt",
+ 	    "YouTube",
+    ],
+    strip: {
+        none: true,
+    },
+    srcs: ["RemovePackagesVince"],
+}
\ No newline at end of file
diff --git a/removepackages/Android.mk b/removepackages/Android.mk
deleted file mode 100644
index 0bd74fa..0000000
--- a/removepackages/Android.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := RemovePackages
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_OVERRIDES_PACKAGES := \
-	AudioFX \
-	arcore \
-	AICorePrebuilt \
-	AiWallpapers \
-	AndroidAutoStubPrebuilt \
-	Camera2 \
-	Calendar2 \
-	Calendar \
-  DevicePersonalizationPrebuiltPixel2020 \
-	DeviceAsWebcam \
-  DuckDuckGo \
-	Etar \
-  Flash \
-	GoogleTTS \
-	Gallery2 \
-	Jellyfish \
-	Jelly \
-	Maps \
-	Photos \
-	PixelThemesStub \
-	PixelThemesStub2022_and_newer \
-	PixelWallpapers2023 \
-	PixelLiveWallpaperPrebuilt \
-	Recorder \
-	SnapCamera \
-	SafetyHubPrebuilt \
-	Seedvault \
-  SimpleGallery \
-	TurboPrebuilt \
-	WellbeingPrebuilt \
-	YouTube
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := /dev/null
-include $(BUILD_PREBUILT)
diff --git a/removepackages/RemovePackagesVince b/removepackages/RemovePackagesVince
new file mode 100644
index 0000000..e69de29