diff --git a/config/common.mk b/config/common.mk
index 3dc5cac2..394bdfd3 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -126,8 +126,6 @@ PRODUCT_PACKAGES += \
 # Optional CM packages
 PRODUCT_PACKAGES += \
     VoicePlus \
-    VoiceDialer \
-    SoundRecorder \
     Basic \
     libemoji
 
@@ -159,7 +157,6 @@ PRODUCT_PACKAGES += \
     mke2fs \
     tune2fs \
     bash \
-    vim \
     nano \
     htop \
     powertop \
diff --git a/config/common_full.mk b/config/common_full.mk
index dbc31d8e..3be12a52 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -17,7 +17,9 @@ PRODUCT_PACKAGES += \
     NoiseField \
     PhaseBeam \
     VisualizationWallpapers \
-    PhotoTable
+    PhotoTable \
+    VoiceDialer \
+    SoundRecorder
 
 PRODUCT_PACKAGES += \
     VideoEditor \
@@ -26,3 +28,7 @@ PRODUCT_PACKAGES += \
     libvideoeditor_osal \
     libvideoeditor_videofilters \
     libvideoeditorplayer
+
+# Extra tools in CM
+PRODUCT_PACKAGES += \
+    vim
diff --git a/config/telephony.mk b/config/telephony.mk
index ddb8369b..1a668623 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -17,3 +17,7 @@ PRODUCT_PACKAGES += \
     Stk \
     CellBroadcastReceiver \
     WhisperPush
+
+# Mms depends on SoundRecorder for recorded audio messages
+PRODUCT_PACKAGES += \
+    SoundRecorder