diff --git a/product.mk b/product.mk
index a9c0dc4..91e4b7d 100644
--- a/product.mk
+++ b/product.mk
@@ -14,6 +14,16 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 ## Recovery
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.sys.recovery_update=true
 
+## Remove Dialer Apps
+ifneq ($(filter %yellowstone,$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += remove-dialer
+endif
+
+## Remove Telephony Apps
+ifneq ($(filter %flo %gts4lvwifi %icosa,$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += remove-telephony
+endif
+
 ## Updater
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += cm.updater.uri="https://updater.oddsolutions.us/api/v1/{device}/{type}/{incr}"
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += cm.updater.allow_downgrading=true
diff --git a/remove-dialer/Android.mk b/remove-dialer/Android.mk
new file mode 100644
index 0000000..d274a16
--- /dev/null
+++ b/remove-dialer/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := remove-dialer
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_OVERRIDES_PACKAGES := Dialer GoogleDialer
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SRC_FILES := /dev/null
+LOCAL_CERTIFICATE := PRESIGNED
+include $(BUILD_PREBUILT)
diff --git a/remove-telephony/Android.mk b/remove-telephony/Android.mk
new file mode 100644
index 0000000..99875da
--- /dev/null
+++ b/remove-telephony/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := remove-telephony
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_OVERRIDES_PACKAGES := CarrierServicesGoogle Dialer GoogleDialer Messages Messaging Telecom Telephony
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SRC_FILES := /dev/null
+LOCAL_CERTIFICATE := PRESIGNED
+include $(BUILD_PREBUILT)