diff --git a/device.mk b/device.mk
index 5b640cc..3ecdc3e 100755
--- a/device.mk
+++ b/device.mk
@@ -150,6 +150,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     Snap
 
+# Codec2 modules
+PRODUCT_PACKAGES += \
+    com.android.media.swcodec \
+    libsfplugin_ccodec
+
 # Connectivity Engine support (CNE)
 PRODUCT_PACKAGES += \
     libcnefeatureconfig
diff --git a/system.prop b/system.prop
index 8c90694..edf6f14 100755
--- a/system.prop
+++ b/system.prop
@@ -44,6 +44,9 @@ ro.qualcomm.bluetooth.map=true
 persist.camera.gyro.disable=0
 persist.camera.imglib.fddsp=0
 
+# Codec2 switch
+debug.media.codec2=2
+
 # CNE
 #persist.vendor.cne.feature=1
 
@@ -64,9 +67,6 @@ ro.qcom.ad=1
 # DRM
 drm.service.enabled=true
 
-#property to enable fingerprint
-persist.qfp=false
-
 # Graphics
 debug.egl.hw=1
 debug.gralloc.enable_fb_ubwc=1