diff --git a/config/common.mk b/config/common.mk
index 8276dc0d4d1cff4bd22825140d6cf2887d161a32..f90016831c9dd310e70d6a40ecf62d7c8a998acb 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -118,16 +118,12 @@ PRODUCT_PACKAGES += \
     MozillaNlpBackend \
     OpenWeatherMapWeatherProvider \
     AccountManager \
-    MagicEarth \
-    PdfViewer \
     Camera \
     eDrive \
-    Weather \
     Notes \
     Tasks \
     NominatimNlpBackend \
     DroidGuard \
-    LibreOfficeViewer \
     OpenKeychain \
     Message \
     Browser \
@@ -136,6 +132,15 @@ PRODUCT_PACKAGES += \
     ESmsSync \
     SystemUIWithLegacyRecents \
 
+# Optional Applications
+ifeq ($(MINIMAL_APPS),false)
+PRODUCT_PACKAGES += \
+    MagicEarth \
+    PdfViewer \
+    Weather \
+    LibreOfficeViewer
+endif
+
 PRODUCT_PACKAGES += \
     Terminal