diff --git a/config/common.mk b/config/common.mk
index 6a5efbf2f34b27d86050e1bbe25589b5fb845c0d..c6dcb57728454f48fde7f6d2ac05c372cdae7a0a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -111,16 +111,12 @@ PRODUCT_PACKAGES += \
     MozillaNlpBackend \
     OpenWeatherMapWeatherProvider \
     AccountManager \
-    MagicEarth \
-    PdfViewer \
     Camera \
     eDrive \
-    Weather \
     Notes \
     Tasks \
     NominatimNlpBackend \
     DroidGuard \
-    LibreOfficeViewer \
     OpenKeychain \
     Message \
     Browser \
@@ -129,6 +125,15 @@ PRODUCT_PACKAGES += \
     ESmsSync \
     PwaPlayer
 
+# Optional Applications
+ifeq ($(MINIMAL_APPS),false)
+PRODUCT_PACKAGES += \
+    MagicEarth \
+    PdfViewer \
+    Weather \
+    LibreOfficeViewer
+endif
+
 # Required CM packages
 PRODUCT_PACKAGES += \
     BluetoothExt \