diff --git a/config/common.mk b/config/common.mk
index 3697184eec02e90e25089bfabc014531468878f4..120007073fe2d781c46915b49d4578f583227b83 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -14,6 +14,10 @@
 
 VENDOR_PATH := vendor/eos
 
+# Removes proprietary apps
+PRODUCT_PACKAGES += \
+    RemoveProprietaryApps
+
 # CustomLocale
 ifeq (test,$(RELEASE_TYPE))
 PRODUCT_PACKAGES += \
diff --git a/remove/Android.mk b/remove/Android.mk
new file mode 100644
index 0000000000000000000000000000000000000000..6bf622d0e1efc1bb76ed46d2b97527d9b560495a
--- /dev/null
+++ b/remove/Android.mk
@@ -0,0 +1,30 @@
+LOCAL_PATH := $(call my-dir)
+
+HOTWORD_PACKAGES := HotwordEnrollmentOKGoogleWCD9340 HotwordEnrollmentXGoogleWCD9340 HotwordEnrollment \
+        HotwordEnrollmentOKGoogleWCD9330 HotwordEnrollmentTGoogleWCD9330 HotwordEnrollmentXGoogleWCD9330 \
+        HotwordEnrollmentOKGoogleHEXAGON HotwordEnrollmentXGoogleHEXAGON HotwordEnrollmentOKGoogleExCORTEXM4 \
+        HotwordEnrollmentXGoogleExCORTEXM4 HotwordEnrollmentOKGoogleRT5677 HotwordEnrollmentOKGoogleWCD9335 \
+        HotwordEnrollmentXGoogleWCD9335 HotwordEnrollmentOKGoogleEx2TL3210 HotwordEnrollmentXGoogleEx2TL3210 \
+        HotwordEnrollmentOKGoogleWCD9340_SDM845 HotwordEnrollmentXGoogleWCD9340_SDM845 HotwordEnrollmentTGoogleWCD9335 \
+        HotwordEnrollmentOKGoogleCORTEXM4 HotwordEnrollmentXGoogleCORTEXM4 HotwordEnrollmentOKGoogleEx3HEXAGON \
+        HotwordEnrollmentXGoogleEx3HEXAGON HotwordEnrollmentOKGoogleWM8280 HotwordEnrollmentOKGoogleHI6403 \
+        HotwordEnrollmentXGoogleHI6403 HotwordEnrollmentOKGoogleRT5514P HotwordEnrollmentXGoogleRT5514P \
+        HotwordEnrollmentOKGoogleFUSIONPro HotwordEnrollmentXGoogleFUSIONPro HotwordEnrollmentOKGoogleFUSION \
+        HotwordEnrollmentXGoogleFUSION HotwordEnrollmentXGoogleExWCD9340 HotwordEnrollmentOKGoogleExWCD9340 \
+        HotwordEnrollmentOKGoogleRT5514 HotwordEnrollmentXGoogleRT5514 HotwordEnrollmentOKGoogleHEMIDELTA \
+        HotwordEnrollmentXGoogleHEMIDELTA
+
+DEVICE_PERSONALIZATION_PACKAGES := DevicePersonalizationPrebuiltPixel2 DevicePersonalizationPrebuiltPixel3 \
+        DevicePersonalizationPrebuiltPixel4 DevicePersonalizationPrebuiltPixel2020  \
+        DevicePersonalizationPrebuiltPixel2021 DevicePersonalizationPrebuiltPixel2022
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := RemoveProprietaryApps
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_OVERRIDES_PACKAGES := DeviceIntelligenceNetworkPrebuilt AmbientSensePrebuilt \
+        $(DEVICE_PERSONALIZATION_PACKAGES) $(HOTWORD_PACKAGES)
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SRC_FILES := /dev/null
+LOCAL_CERTIFICATE := PRESIGNED
+include $(BUILD_PREBUILT)