diff --git a/config/common.mk b/config/common.mk
index 3b74447c..030ca5cc 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -95,6 +95,19 @@ ifneq ($(TARGET_DISABLE_EPPE),true)
 $(call enforce-product-packages-exist-internal,$(wildcard device/*/$(LINEAGE_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar Launcher3 Launcher3Go Launcher3QuickStep Launcher3QuickStepGo android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package)
 endif
 
+ifeq ($(PRODUCT_IS_ATV),)
+# Include AOSP audio files
+include vendor/lineage/config/aosp_audio.mk
+
+# Include Lineage audio files
+include vendor/lineage/config/lineage_audio.mk
+
+# Default notification/alarm sounds
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.config.notification_sound=Argon.ogg \
+    ro.config.alarm_alert=Hassium.ogg
+endif
+
 # Bootanimation
 TARGET_SCREEN_WIDTH ?= 1080
 TARGET_SCREEN_HEIGHT ?= 1920
@@ -106,6 +119,12 @@ PRODUCT_PACKAGES += \
     build-manifest
 
 # Lineage packages
+ifeq ($(PRODUCT_IS_ATV),)
+PRODUCT_PACKAGES += \
+    ExactCalculator \
+    Jelly
+endif
+
 ifeq ($(PRODUCT_IS_AUTOMOTIVE),)
 PRODUCT_PACKAGES += \
     LineageParts \
diff --git a/config/common_car.mk b/config/common_car.mk
index e848ddec..868e9733 100644
--- a/config/common_car.mk
+++ b/config/common_car.mk
@@ -3,8 +3,3 @@ $(call inherit-product, vendor/lineage/config/common.mk)
 
 # Inherit Lineage car device tree
 $(call inherit-product, device/lineage/car/lineage_car.mk)
-
-# Apps
-PRODUCT_PACKAGES += \
-    ExactCalculator \
-    Jelly
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index a9a66ee2..208a7441 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -1,22 +1,9 @@
 # Inherit common mobile Lineage stuff
 $(call inherit-product, vendor/lineage/config/common.mk)
 
-# Include AOSP audio files
-include vendor/lineage/config/aosp_audio.mk
-
-# Include Lineage audio files
-include vendor/lineage/config/lineage_audio.mk
-
-# Default notification/alarm sounds
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Hassium.ogg
-
 # Apps
 PRODUCT_PACKAGES += \
-    Backgrounds \
-    ExactCalculator \
-    Jelly
+    Backgrounds
 
 ifeq ($(PRODUCT_TYPE), go)
 PRODUCT_PACKAGES += \