diff --git a/config/common.mk b/config/common.mk
index 2516c46..b0853a5 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -24,10 +24,10 @@
     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
 endif
 
-# Default notification/alarm sounds
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Hassium.ogg
+# Default ringtone/notification/alarm sounds
+TARGET_DEFAULT_RINGTONE := The_big_adventure.ogg
+TARGET_DEFAULT_NOTIFICATION_SOUND := Popcorn.ogg
+TARGET_DEFAULT_ALARM_ALERT := Bright_morning.ogg
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 # Thank you, please drive thru!
@@ -99,10 +99,6 @@
 PRODUCT_COPY_FILES += \
     vendor/bliss/prebuilt/common/etc/sensitive_pn.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sensitive_pn.xml
 
-# Default ringtone
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.config.ringtone=Orion.ogg
-
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \